Rework controller for proper chaining.
Clean up log messages.
Add custom Contract form field.