Completed some of the TODOs