__Todos/plan__ - [ ] Priority - [ ] Add unit tests (Have been manually and functionally tested on live application, just a note) - [ ] No priority - [x] Nothing yet..
Todos/plan