Some additions to elevator logic
Merge branch 'Elevatorlogic'