Refactored forms. Committing for troubleshooting