Implemented a couple TODOs.