major changes and initial design push