M16 - Forms refactoring.