Added specs, concordion now removes Test at the end of the file when looking for the spec file
Major refactoring of code to be more readable, extensible...and better generally.