Begin refactory for developing the watch feature
Small fix
Fix issues and add tests
Add some code for future Version method
Add some doc about Watch