take 3, for homework 3

made changes to the classes