Assignment1_step1

changes to some classes