Crossing some things out and adding some TODOs