All my todo items after code review with Jonathan