Added todo
Whole bunch of changes!