start implementing watch feature