Finished all the todo's from last time