split class Watch into its own file.  incremented version.