adding the form stuff
fix merge conflicts