Form Defintion and Generator now working - need to refactor to make 'Attrs' based on object key so no need for ifs