discontinuing extensions
Merge branch 'develop' into feature/extensions
added extensibility
Merge branch 'feature/extensions' into develop