Streamliing; more adding of namespaces and documentation.