Final Commit from Code Day SFO

Doesn't really work.  Still WIP.