Major Refactoring

David Flanagan requested to merge feature/refactoring-for-1.0 into master Dec 26, 2017