Added most of the form