hopefully final commit - mostly everything is working but still might be issue moving to hallway