Merge some stuff.
Changed code to comply with task refactor, not running correctly.
Removed notion of TaskStatus in favor of Stage. Work credit: wavanrensselaer
a very weird merge