Continued work on form model and refactoring