Mapped namespaces to begin working on #43 + #44
fixes #44