Massive refactoring / form example (WIP).