diff --git a/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/HeteroList.java b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/HeteroList.java
new file mode 100644
index 0000000000000000000000000000000000000000..6b832e8c627a8fdd479387fa49ac4ff8916753f4
--- /dev/null
+++ b/ui-samples-plugin/src/main/java/jenkins/plugins/ui_samples/HeteroList.java
@@ -0,0 +1,150 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2013 Jesse Glick.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package jenkins.plugins.ui_samples;
+
+import hudson.Extension;
+import hudson.XmlFile;
+import hudson.model.AbstractDescribableImpl;
+import hudson.model.Descriptor;
+import hudson.util.FormApply;
+import hudson.util.ListBoxModel;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javax.servlet.ServletException;
+import jenkins.model.Jenkins;
+import org.kohsuke.stapler.DataBoundConstructor;
+import org.kohsuke.stapler.HttpResponse;
+import org.kohsuke.stapler.StaplerRequest;
+
+@Extension public final class HeteroList extends UISample {
+
+    @Override public String getDescription() {
+        return "Show a heterogeneous list of subitems with different data bindings for radio buttons and checkboxes";
+    }
+
+    @Override public List<SourceFile> getSourceFiles() {
+        return super.getSourceFiles();
+        // TODO add others
+    }
+
+    @Extension public static final class DescriptorImpl extends UISampleDescriptor {}
+
+    public XmlFile getConfigFile() {
+        return new XmlFile(new File(Jenkins.getInstance().getRootDir(), "stuff.xml"));
+    }
+
+    private Config config;
+
+    public HeteroList() throws IOException {
+        XmlFile xml = getConfigFile();
+        if (xml.exists()) {
+            xml.unmarshal(this);
+        }
+    }
+
+    public Config getConfig() {
+        return config;
+    }
+
+    public void setConfig(Config config) {
+        this.config = config;
+    }
+
+    public HttpResponse doConfigSubmit(StaplerRequest req) throws ServletException, IOException {
+        config = null; // otherwise bindJSON will never clear it once set
+        req.bindJSON(this, req.getSubmittedForm());
+        getConfigFile().write(this);
+        return FormApply.success(".");
+    }
+
+    public static final class Config extends AbstractDescribableImpl<Config> {
+
+        private final List<Entry> entries;
+
+        @DataBoundConstructor public Config(List<Entry> entries) {
+            this.entries = entries != null ? new ArrayList<Entry>(entries) : Collections.<Entry>emptyList();
+        }
+
+        public List<Entry> getEntries() {
+            return Collections.unmodifiableList(entries);
+        }
+
+        @Extension public static class DescriptorImpl extends Descriptor<Config> {
+            @Override public String getDisplayName() {return "";}
+        }
+
+    }
+
+    public static abstract class Entry extends AbstractDescribableImpl<Entry> {}
+
+    public static final class SimpleEntry extends Entry {
+
+        private final String text;
+
+        @DataBoundConstructor public SimpleEntry(String text) {
+            this.text = text;
+        }
+
+        public String getText() {
+            return text;
+        }
+
+        @Extension public static class DescriptorImpl extends Descriptor<Entry> {
+            @Override public String getDisplayName() {
+                return "Simple Entry";
+            }
+        }
+
+    }
+
+    public static final class ChoiceEntry extends Entry {
+
+        private final String choice;
+
+        @DataBoundConstructor public ChoiceEntry(String choice) {
+            this.choice = choice;
+        }
+
+        public String getChoice() {
+            return choice;
+        }
+
+        @Extension public static class DescriptorImpl extends Descriptor<Entry> {
+
+            @Override public String getDisplayName() {
+                return "Choice Entry";
+            }
+
+            public ListBoxModel doFillChoiceItems() {
+                return new ListBoxModel().add("good").add("bad").add("ugly");
+            }
+
+        }
+    }
+
+}
diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/ChoiceEntry/config.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/ChoiceEntry/config.jelly
new file mode 100644
index 0000000000000000000000000000000000000000..9fba952485dfd70c7bd372cc6b8b7158041e644a
--- /dev/null
+++ b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/ChoiceEntry/config.jelly
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+The MIT License
+
+Copyright 2013 Jesse Glick.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
+    <f:entry field="choice" title="Choice">
+        <f:select/>
+    </f:entry>
+    <!-- TODO figure out if f:radioBlock can also be used for form binding: Failed to instantiate class java.lang.String from {"value":"good"} -->
+</j:jelly>
diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/Config/config.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/Config/config.jelly
new file mode 100644
index 0000000000000000000000000000000000000000..9f7c655651fc1575dfbb0e53cb36d9ca055b14ad
--- /dev/null
+++ b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/Config/config.jelly
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+The MIT License
+
+Copyright 2013 Jesse Glick.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
+    <f:section title="Entries">
+        <f:block>
+            <f:repeatableHeteroProperty field="entries" hasHeader="true">
+                <f:entry title="">
+                    <div align="right">
+                        <f:repeatableDeleteButton/>
+                    </div>
+                </f:entry>
+            </f:repeatableHeteroProperty>
+        </f:block>
+    </f:section>
+</j:jelly>
diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/SimpleEntry/config.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/SimpleEntry/config.jelly
new file mode 100644
index 0000000000000000000000000000000000000000..e98b3ef2a3be2d54cf9a36302b918b4703f84bd6
--- /dev/null
+++ b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/SimpleEntry/config.jelly
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+The MIT License
+
+Copyright 2013 Jesse Glick.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
+    <f:entry field="text" title="Text">
+        <f:textbox/>
+    </f:entry>
+</j:jelly>
diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/configure.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/configure.jelly
new file mode 100644
index 0000000000000000000000000000000000000000..e48529c9bed3578e8745c9c7f551ea09b82ef22b
--- /dev/null
+++ b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/configure.jelly
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+The MIT License
+
+Copyright 2013 Jesse Glick.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:l="/lib/layout">
+    <l:layout title="Configure">
+        <l:main-panel>
+            <h1>Configuration</h1>
+            <f:form action="configSubmit" name="config" method="post">
+                <j:set var="instance" value="${it}"/>
+                <j:set var="descriptor" value="${it.descriptor}"/>
+                <f:optionalProperty field="config" title="Enable Configuration"/>
+                <f:bottomButtonBar>
+                    <f:submit value="${%Save}"/>
+                    <f:apply/>
+                </f:bottomButtonBar>
+            </f:form>
+        </l:main-panel>
+    </l:layout>
+</j:jelly>
diff --git a/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/index.jelly b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/index.jelly
new file mode 100644
index 0000000000000000000000000000000000000000..2ed9ee4a9f980fc80ffe704b7066168846da73f5
--- /dev/null
+++ b/ui-samples-plugin/src/main/resources/jenkins/plugins/ui_samples/HeteroList/index.jelly
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+The MIT License
+
+Copyright 2013 Jesse Glick.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:s="/lib/samples">
+    <s:sample title="Hetero List Sample">
+        <p>
+            <a href="configure">Configure me!</a>
+        </p>
+        <j:if test="${it.configFile.exists()}">
+            <p>
+                Current configuration:
+            </p>
+            <pre>
+                ${it.configFile.asString()}
+            </pre>
+        </j:if>
+    </s:sample>
+</j:jelly>