Cleaned up the design a good deal. Took care of some of the rat's nest of dependencies and simplified the execution a little bit, so it's now more linear. Also performed some general organization of the code.