de-namespaced to Zit_Container, tests too.  passing