Worked some more on this assignment