Merge from elevator_block (elevator power usage is now 5 all the time, forgot to merge this earlier in the month)