More TODOs and stuff
Updated todo and working on scenario/pitch