Updating WIP (Dungeon, Floor, Square)

See next commit for complete change log.