Ready

Refactored some things I thought could be done better. Removed futile
code that is not of any use to the excercise.