More refactored methods with unit tests. Currently 22 tests passing, 5 failing.
Merge branch 'master' of github.com:monotasker/paideia