[Adam] incorporating feedback and initial project design