Issue #73 - Form updates to use local variables.