use watchCollection and implement tests
recompile