lets try passing less entity pointers around willy nilly