Made changes to parser and started on FormController.