Stripped back multistepform work and put into diff repository