more work on room transitions, still broken