Changing initial form format, hopefully this is the last commit for the day