adding new classes and modifying classes that use them
Merge branch 'master' of https://github.com/timdenouden/Project