nearing completion - this file 50%, overall 90% on namespace