[TASK] restructure entity watching, to allow for later change-detection