Added some TODOs for myself.