Addressed some of the "todo"s