another set of files
resolve merge conflict
nearing completion - this file 50%, overall 90% on namespace
final file. all that remains is clean up and formatting.