Err.. uncommented floor changing stuff and commented the not yet working timer stuff.
Fixed merge conflicts. Not much.