Somewhat large overhaul to move the kiosk towards using normal python