forms working
cleaned up forms