More changes to forms, however I broke it