Removed room identification from Block
Removed unnecessary Room requirement for all Blocks
Catch-up
Re-added the references I've accidentally deleted