Refactoring the form system to be simplified and abstracting the mecanics