Wednesday Commit

Lots of stuff done, a mostly stable build to show off at the midpoint
demo.
adfafda

adfadf