2nd commit

finished coding and commenting