added in unlimited fields, attributes, etc, everything should be done