Updated Todo
Began updating code for new design