I think I'm done (majority of Assig3 class)

now for bug testing!