Added watch <-> model relationship/retension

Signed-off-by: Darren Ehlers <me@darrenehlers.com>
Merge branch 'refs/heads/fix_kiwi_test'