Yet again improving namespaceness
Re-adding distinct m_Active member
Basic tests added