More namespace stuff. Modules are broke, so yay