developing forms, modifying templates for forms

I haven't finished it all, but I need to commit these files to my branch
to go to another's branch to look at their implementation