Initial add with basic structures in place