Formatting changes
Removed comments
Commented out my code, waiting on FormBuilder/parser...