Changes up through assignment 5
Take two on changes up through assignment 5.