Refactored grid, added section for room block. I love you Renée :)