Room builds

Needs tweaking