(master) WIP integrating new form. Nothing really works yet...