integration and some cleanup

Greg, 
please pull my forked version to the master. I performed an initial integration and did some light re-factoring. We can discuss more on Monday.

Where's the projectile??

... Dr. Lutz