Completed some todos
Completed some todos