add building system and split out commons