Finally added a form object manager which has been tested in isolation.