Started working on the forms & controller