Solved some of the TODOs