add new forms infastructure - not yet fully implemented, but a good way there
fix merge conflict in setup.py