I know, we'll need to clean our intents after today.  I'll merge so we're all on the same code base.

I'll have my tablet with the code already loaded.  Can someone volunteer their computer?