Refactor some work to make child classes more configuration than code
Merge pull request #2 from singlebrook/refactor_some

Refactor some work to make child classes more configuration than code