Squash me.  Added some rudimentary test structure and modified some objects a little.