Fixed init with no args

Moved init into a new method
Added todo items