remove old assignments, add pset1 (almost there)
branch adjustments