updated to use form and added watcher binding