Testmerge

This is our latest stuff, and we showed it in the demo, so we should probably merge this.  Any thoughts?