Researching code passing between entities, must refactor a lot of things