First run at my own solution (Jonathon McDonald), not tested and not working
Merge branch 'master' of https://github.com/regehr/solid_code_class