Comment indicating the status of the file.
More namespace changes, fixes some tests