Added a bunch of TODOs all over