First complete pass
Expand on namespace creation