Implemented a bunch of TODOs...