Added a bunch of TODOs for the next days