Added a bunch of TODO notes