most of the base architecture added