More kiosk engine work.  Mostly complete.