Still Refactoring.
Almost done refactoring\!
Changed name of test.hs
Just about done this refactoring....