James - more updates
James - rename of namespace