Fixed: Advancing the stage at the wrong time
Removed: Old TODOs