Form Update

Should be functional, next step is prettifying