#2 Add form and watch