Adding a form of namespacing to function definitions.
Merge branch 'feature/namespacing' into develop