Cleans up spec, removes 'pry' requirement, adds a couple 'todo' comments.
Adds comments to orchestrator.