Rewritten room, now with real coords and light
Merge branch 'chris' into dev