Slightly altered the Grid interface to be less dependant on entities