Added in floors, no tests... booooo
Removed unneeded app_router