Added a bunch of TODOs.