Begin building, added headers