Flesh out a bit. Better names for a few classes.
Add a tightly-coupled version of the controller.
Correct annotations,
Last(?) few tweaks?