Rework building: initial changes