Refactored some stuff in kiosk to be in serializible, made more sense there