Flesh out beginning of namespace support