making progress

added support for future form-change