Merge pull request #2 from ageoldpun/master

Cleaned up a bit and added some application tests
Merge pull request #3 from ageoldpun/master

got rid of redundancies
Fixed markers
tweaked test