change the way add halls and grid works - WIP