Added additional form functionality
Fixing merge conflicts