Fixed issues with the code we turned in friday.
Only four test not passsing.