Passes over assignments 3 and 4

#31 and #47 are now assigned to @jayfo