Refactor :sunglasses:
Updated tests :wrench:
Merge pull request #1 from scotdalton/assignment4

Assignment4