Add Done object.
Constantify, refactorify and resultify

1. Make the test stages more constanty
2. Consolidate the number of places
   where I set the control event sink.
3. Actually story the results in a results
   dictionary that gets returned to the
   caller via the Done object.