Refactoring and forms now added.