+ Also began work on namespace changes! Will need to be merged with any current pending namespace changes.
