rework into a single entity manager...still have things to cleanup
though