second merge

Client asking for changes beyond scope of assignment, saving state here