more refactor; done with MDA div model
Merge branch 'master' of https://github.com/SunnySunnia/TheQuakers