got watch to work...cleaning up