Merge pull request #246 from Jedwondle/master

Watches are mostly done.