I like this more
Merge pull request #1 from CanyonCounty/rework

I like this more