alot of refactoring
everything works except floors keep incrementing???