Refactors form system for greater modularity #79.