partial commit - still fixing policies and tests