       @set
         saveable: (! @clone.validate?) or @clone.isValid _.keys @fields.attributes()
 
-  buildFields: (attributes) =>
+  buildFields: =>
 
     @fields = new FieldList
 
+    @fields.form = @
+
     @fields.currentModel = @clone
 
-    @fields.add attributes?.fields
+    @fields.add @get 'fields'
 
     @fields.on 'change', (field) =>
 


    @buildClone()

    @buildFields attributes

  buildClone: =>


      # Trigger the change event since we were silent
      @clone.change()

    @fields.on 'save', =>

      if @clone.isValid(true)
        @save()

  save: =>

    if @get 'updateOnly'
