Changed working demo to support safe mode swapping.  Refactoring coming up, then a push to master.