Decoupled the Entity from Frame, so it is more properly a wrapper.