restored to previous to keep as assignment 2 stuff.  3 will be in new
branch