Added todos
removed unused save/load code
updated TODOs