Implemented some of the TODOs