Added a todo
Moved todo's to a separate file