working on removing body from Entity