slight changes preparing to begin form handling
merging changes