Added object addition ability, cleaned up, added namespaces