Added a lot of TODOs