Almost done with hallways (don't merge)