tons of changes, still early formulation of the overall structure