Logical reorganizing plus adding extra capabilities
Merge branch 'master' of https://github.com/gschandler/WoolyCoreData