diff --git a/ignite-template.js b/ignite-template.js
index 1fa671e..d572570 100644
--- a/ignite-template.js
+++ b/ignite-template.js
@@ -966,7 +966,23 @@ class IgniteTemplate {
      * @returns This ignite template so function calls can be chained.
      */
     placeholder(value, converter = null) {
-        return this.attribute("placeholder", value, converter);
+        //If this is a input element, modify the attribute, otherwise add the placeholder class.
+        if (this.tagName == "input") {
+            return this.attribute("placeholder", value, converter);
+        } else {
+            if (value instanceof IgniteProperty) {
+                return this.class(value, convert => {
+                    convert = (converter != null ? converter(convert) : convert);
+                    if (convert) {
+                        return "placeholder";
+                    } else {
+                        return null;
+                    }
+                });
+            } else {
+                return this.class("placeholder");
+            }
+        }
     }
 
     /**
@@ -2031,7 +2047,7 @@ class html extends IgniteTemplate {
 class list extends IgniteTemplate {
     /**
      * @param {Array|IgniteProperty} list The list of items to construct within this template.
-     * @param {Function} forEach A function that construct a template for an item from the list that is passed to it. The parameters are: item, index
+     * @param {Function(item, index, count)} forEach A function that constructs a template foreach item.
      * @param {Boolean} reflect If true any items removed from the DOM will be removed from the list if they exist. By default this is false.
      */
     constructor(list, forEach, reflect = false) {
@@ -2104,7 +2120,7 @@ class list extends IgniteTemplate {
         //Construct all the items in our list and use the container
         if (this.list) {
             for (var i = 0; i < this.list.length; i++) {
-                var template = this.forEach(this.list[i], i);
+                var template = this.forEach(this.list[i], i, this.list.length);
                 if (template) {
                     template.construct(parent, this.element);