working on merging the form into the theme
merging
put the form in the theme
merging
moving back to localhost dev