* Add TODO's
* Some refactor