working on forms
fixed merge conflicts