Added a bunch of TODOs and comments