Make it watch

Depends on #62 and probably needs tests or something.