2nd commit sync

Again, more infrastructure.  Almost have a working game running.