Mostly wrapped up the namespace class and clean some things up.