Editing manager layer to work with our entity manager

edited the core so it talks to our entity manager

Author: lhunker