Some More Refactoring

The Tamarin forms approach seems to be working!
Auto Generated Build Code