Move kiosk code out to engine.  Almost complete.