diff --git a/README.md b/README.md
index 2ddb2d3..0ce7986 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Minimum dependencies that you need to provide in your application:
 
 #### Vanilla setup
 
-Create an instance of `Loader` (concrete class `com.eclecticlogic.pedal.loader.impl.LoaderImpl`) and give it a reference to an `EntityManager`. 
+For classpath-based loading, create an instance of `Loader` (concrete class `com.eclecticlogic.pedal.loader.impl.LoaderImpl`) and give it a reference to an `EntityManager`.  For filesystem-based loading, create an instance of `com.eclecticlogic.pedal.loader.impl.FileSystemLoaderImpl` instead of `com.eclecticlogic.pedal.loader.impl.LoaderImpl`.
 
 #### Spring 
 
@@ -62,7 +62,7 @@ The Loader interface provides a number of methods to specify your script and inp
 ```
     loader.withScriptDirectory("myScripts").load("basicdata.groovy");
 ```
-This specifies that the loader should read the script basicdata.groovy contained within a classpath directory called myScripts. The file could just as well have been specified with the directory as `myScripts\basicdata.groovy`. However, the withScriptDirectory allows you to setup a well known directory and have all other calls simply reference the script by name without worry about relative paths.
+This specifies that the loader should read the script basicdata.groovy contained within a classpath or filesystem directory called myScripts. The file could just as well have been specified with the directory as `myScripts\basicdata.groovy`. However, the withScriptDirectory allows you to setup a well known directory and have all other calls simply reference the script by name without worry about relative paths.
 
 ### Script Format
 
diff --git a/src/main/java/com/eclecticlogic/pedal/loader/impl/AbstractLoaderImpl.java b/src/main/java/com/eclecticlogic/pedal/loader/impl/AbstractLoaderImpl.java
new file mode 100644
index 0000000..5a339ae
--- /dev/null
+++ b/src/main/java/com/eclecticlogic/pedal/loader/impl/AbstractLoaderImpl.java
@@ -0,0 +1,85 @@
+package com.eclecticlogic.pedal.loader.impl;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import com.eclecticlogic.pedal.loader.Loader;
+import com.eclecticlogic.pedal.loader.LoaderExecutor;
+import com.eclecticlogic.pedal.loader.Script;
+
+import groovy.lang.Closure;
+
+/**
+ * 
+ * Abstract implementation for all of the {@link Loader} implementations
+ * 
+ * @author kabram.
+ * @author Craig Setera
+ *
+ */
+public abstract class AbstractLoaderImpl implements Loader {
+
+    public AbstractLoaderImpl() {
+        super();
+    }
+
+    public AbstractLoaderImpl(EntityManager entityManager) {
+        super();
+        this.entityManager = entityManager;
+    }
+
+	protected String scriptDirectory;
+	protected Map<String, Closure<Object>> customMethods = new HashMap<>();
+	
+	@PersistenceContext
+	protected EntityManager entityManager;
+
+	public void setEntityManager(EntityManager entityManager) {
+	    this.entityManager = entityManager;
+	}
+
+	@Override
+	public Loader withScriptDirectory(String directory) {
+	    scriptDirectory = directory;
+	    return this;
+	}
+
+	@Override
+	public Loader withCustomMethod(String methodName, Closure<Object> closure) {
+	    customMethods.put(methodName, closure);
+	    return this;
+	}
+
+	@Override
+	public LoaderExecutor withInputs(Map<String, Object> inputs) {
+		AbstractScriptExecutor executor = createScriptExecutor();
+	    executor.setInputs(inputs);
+	    return executor;
+	}
+
+	@Override
+	public Map<String, Object> load(String loadScript, String... additionalScripts) {
+	    return createScriptExecutor().load(loadScript, additionalScripts);
+	}
+
+	@Override
+	public Map<String, Object> load(Script script, Script... additionalScripts) {
+	    return createScriptExecutor().load(script, additionalScripts);
+	}
+
+	@Override
+	public Map<String, Object> load(Collection<String> loadScripts) {
+	    return createScriptExecutor().load(loadScripts);
+	}
+
+	@Override
+	public Map<String, Object> loadNamespaced(Collection<Script> loadScripts) {
+	    return createScriptExecutor().loadNamespaced(loadScripts);
+	}
+
+	protected abstract AbstractScriptExecutor createScriptExecutor();
+}
diff --git a/src/main/java/com/eclecticlogic/pedal/loader/impl/AbstractScriptExecutor.java b/src/main/java/com/eclecticlogic/pedal/loader/impl/AbstractScriptExecutor.java
new file mode 100644
index 0000000..99c12af
--- /dev/null
+++ b/src/main/java/com/eclecticlogic/pedal/loader/impl/AbstractScriptExecutor.java
@@ -0,0 +1,332 @@
+package com.eclecticlogic.pedal.loader.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Stack;
+
+import javax.persistence.EntityManager;
+
+import org.apache.commons.io.IOUtils;
+
+import com.eclecticlogic.pedal.loader.LoaderExecutor;
+import com.eclecticlogic.pedal.loader.Script;
+
+import groovy.lang.Binding;
+import groovy.lang.Closure;
+import groovy.lang.GroovyShell;
+
+public abstract class AbstractScriptExecutor implements LoaderExecutor {
+
+    protected String scriptDirectory;
+    private Stack<ScriptContext> scriptContextStack = new Stack<>();
+    private Stack<Map<String, Object>> scriptInputs = new Stack<>(); // used to pass inputs to scripts when defined using withInput
+
+    private Map<String, Object> inputs = new HashMap<>();
+
+    private EntityManager entityManager;
+    private Map<String, Closure<Object>> customMethods;
+
+
+    protected AbstractScriptExecutor(EntityManager manager) {
+        this.entityManager = manager;
+    }
+
+
+    public void setScriptDirectory(String scriptDirectory) {
+        this.scriptDirectory = scriptDirectory;
+    }
+
+
+    public void setInputs(Map<String, Object> inputs) {
+        this.inputs = inputs;
+    }
+
+
+    public void setCustomMethods(Map<String, Closure<Object>> customMethods) {
+        this.customMethods = customMethods;
+    }
+
+
+    @Override
+    public Map<String, Object> load(String loadScript, String... additionalScripts) {
+        List<String> scripts = new ArrayList<>();
+        scripts.add(loadScript);
+        if (additionalScripts != null) {
+            for (int i = 0; i < additionalScripts.length; i++) {
+                scripts.add(additionalScripts[i]);
+            }
+        }
+
+        return load(scripts);
+    }
+
+
+    @Override
+    public Map<String, Object> load(Script script, Script... additionalScripts) {
+        List<Script> scripts = new ArrayList<>();
+        scripts.add(script);
+        if (additionalScripts != null) {
+            for (int i = 0; i < additionalScripts.length; i++) {
+                scripts.add(additionalScripts[i]);
+            }
+        }
+        return loadNamespaced(scripts);
+    }
+
+
+    @Override
+    public Map<String, Object> load(Collection<String> loadScripts) {
+        List<Script> scripts = new ArrayList<>();
+        for (String script : loadScripts) {
+            scripts.add(Script.script(script));
+        }
+        return loadNamespaced(scripts);
+    }
+
+
+    @Override
+    public Map<String, Object> loadNamespaced(Collection<Script> scripts) {
+        Map<String, Object> variables = new HashMap<>();
+        // Add overall variables
+        Map<String, Object> inputVariables = scriptInputs.isEmpty() ? inputs : scriptInputs.pop();
+
+        for (Entry<String, Object> var : inputVariables.entrySet()) {
+            variables.put(var.getKey(), var.getValue());
+        }
+
+        for (Script script : scripts) {
+            NamespacedBinding binding = create();
+            // Bind inputs.
+            for (String key : variables.keySet()) {
+                binding.setVariable(key, variables.get(key));
+            }
+            binding.startCapture();
+
+            try (InputStream stream = getScriptStream(script)) {
+                List<String> lines = IOUtils.readLines(stream);
+                StringBuilder builder = new StringBuilder();
+                for (String line : lines) {
+                    builder.append(line).append("\n");
+                }
+                execute(builder.toString(), binding);
+            } catch (IOException e) {
+                throw new RuntimeException(e.getMessage(), e);
+            }
+
+            // Add output variables
+            if (script.getNamespace() == null || script.getNamespace().trim().length() == 0) {
+                for (String key : binding.getNamespacedVariables().keySet()) {
+                    variables.put(key, binding.getNamespacedVariables().get(key));
+                }
+            } else {
+                variables.put(script.getNamespace(), binding.getNamespacedVariables());
+            }
+        }
+
+        return variables;
+    }
+
+    /**
+     * Return the proper {@link InputStream} for the specified {@link Script} 
+     * based on the way the subclass is implemented.
+     * 
+     * @param script
+     * @return
+     * @throws IOException 
+     */
+    protected abstract InputStream getScriptStream(Script script) throws IOException;
+    
+    @SuppressWarnings("serial")
+    private NamespacedBinding create() {
+        Closure<List<Object>> table = new Closure<List<Object>>(this) {
+
+            @SuppressWarnings("unchecked")
+            @Override
+            public List<Object> call(Object... args) {
+                if (args == null || args.length != 3) {
+                    throw new RuntimeException("The table method expects JPA entity class reference, "
+                            + "list of bean properties and a closure");
+                }
+                return invokeWithClosure((Class<?>) args[0], (List<String>) args[1], (Closure<Void>) args[2]);
+            }
+        };
+
+        Closure<Object> row = new Closure<Object>(this) {
+
+            @Override
+            public Object call(Object... args) {
+                return invokeRowClosure(args);
+            }
+        };
+
+        Closure<Object> defaultRow = new Closure<Object>(this) {
+
+            @SuppressWarnings("unchecked")
+            @Override
+            public Object call(Object... args) {
+                invokeDefaultRowClosure((Closure<Object>) args[0]);
+                return null;
+            }
+        };
+
+        Closure<Object> find = new Closure<Object>(this) {
+
+            @SuppressWarnings("unchecked")
+            @Override
+            public Object call(Object... args) {
+                return invokeFindClosure((Class<? extends Serializable>) args[0], (Serializable) args[1]);
+            };
+        };
+
+        Closure<Object> withInput = new Closure<Object>(this) {
+
+            @Override
+            public Object call(Object... args) {
+                return invokeWithInputClosure(args[0]);
+            };
+        };
+
+        Closure<Object> load = new Closure<Object>(this) {
+
+            @Override
+            public Object call(Object... args) {
+                return invokeLoadClosure(args);
+            };
+        };
+
+        Closure<Object> flush = new Closure<Object>(this) {
+
+            @Override
+            public Object call(Object... args) {
+                entityManager.flush();
+                return null;
+            };
+        };
+
+        NamespacedBinding binding = new NamespacedBinding();
+        binding.setVariable("table", table);
+        binding.setVariable("row", row);
+        binding.setVariable("defaultRow", defaultRow);
+        binding.setVariable("find", find);
+        binding.setVariable("withInput", withInput);
+        binding.setVariable("load", load);
+        binding.setVariable("flush", flush);
+
+        // Custom methods
+        for (Entry<String, Closure<Object>> entry : customMethods.entrySet()) {
+            binding.setVariable(entry.getKey(), entry.getValue());
+        }
+        return binding;
+    }
+
+
+    @SuppressWarnings("unchecked")
+    public Map<String, Object> execute(String script, Binding binding) {
+        GroovyShell shell = new GroovyShell(getClass().getClassLoader(), binding);
+        shell.evaluate(script);
+        return binding.getVariables();
+    }
+
+
+    private <V> List<Object> invokeWithClosure(Class<?> clz, List<String> attributes, Closure<V> callable) {
+        ScriptContext context = new ScriptContext();
+        context.setEntityClass(clz);
+        context.setAttributes(attributes);
+
+        scriptContextStack.push(context);
+
+        callable.call();
+
+        scriptContextStack.pop();
+        return context.getCreatedEntities();
+    }
+
+
+    private void invokeDefaultRowClosure(Closure<Object> closure) {
+        scriptContextStack.peek().setDefaultRowClosure(closure);
+    }
+
+
+    private Object invokeRowClosure(Object... attributeValues) {
+        Serializable instance = instantiate();
+        DelegatingGroovyObjectSupport<Serializable> delegate = new DelegatingGroovyObjectSupport<Serializable>(instance);
+
+        for (int i = 0; i < scriptContextStack.peek().getAttributes().size(); i++) {
+            delegate.setProperty(scriptContextStack.peek().getAttributes().get(i), attributeValues[i]);
+        }
+        scriptContextStack.peek().getDefaultRowClosure().call(instance);
+        entityManager.persist(instance);
+        scriptContextStack.peek().getCreatedEntities().add(instance);
+        return instance;
+    }
+
+
+    private Object invokeFindClosure(Class<? extends Serializable> clz, Serializable id) {
+        return entityManager.find(clz, id);
+    }
+
+
+    @SuppressWarnings("unchecked")
+    private Object invokeWithInputClosure(Object arg) {
+        Map<String, Object> scriptInput = (Map<String, Object>) arg;
+        scriptInputs.push(scriptInput);
+        // Return a constrained set of operations that are possible. Returning owner will result in the entire set
+        // of methods in this class being exposed.
+        return new Object() {
+
+            @SuppressWarnings("unused")
+            public Map<String, Object> load(String loadScript, String... additionalScripts) {
+                return AbstractScriptExecutor.this.load(loadScript, additionalScripts);
+            }
+
+
+            @SuppressWarnings("unused")
+            public Map<String, Object> load(Map<String, String> namespacedScripts) {
+                List<Script> scripts = new ArrayList<>();
+                for (Entry<String, String> entry : namespacedScripts.entrySet()) {
+                    scripts.add(Script.with(entry.getValue(), entry.getKey()));
+                }
+                return AbstractScriptExecutor.this.loadNamespaced(scripts);
+            }
+        };
+    }
+
+
+    @SuppressWarnings("unchecked")
+    private Object invokeLoadClosure(Object[] args) {
+        if (args.length == 0) {
+            throw new IllegalArgumentException("The load() method should be called with a map of namespace and "
+                    + "script names or a list of one or more script names.");
+        } else if (args[0] instanceof Map) {
+            Map<String, String> scriptMap = (Map<String, String>) args[0];
+            List<Script> scripts = new ArrayList<>();
+            for (String namespace : scriptMap.keySet()) {
+                scripts.add(Script.with(scriptMap.get(namespace), namespace));
+            }
+            return loadNamespaced(scripts);
+        } else {
+            // Assuming these are simply script names.
+            List<String> scripts = new ArrayList<>();
+            for (int i = 0; i < args.length; i++) {
+                scripts.add((String) args[i]);
+            }
+            return load(scripts);
+        }
+    }
+
+
+    private Serializable instantiate() {
+        try {
+            return (Serializable) scriptContextStack.peek().getEntityClass().newInstance();
+        } catch (InstantiationException | IllegalAccessException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+    }
+}
diff --git a/src/main/java/com/eclecticlogic/pedal/loader/impl/FileSystemLoaderImpl.java b/src/main/java/com/eclecticlogic/pedal/loader/impl/FileSystemLoaderImpl.java
new file mode 100644
index 0000000..8850f7d
--- /dev/null
+++ b/src/main/java/com/eclecticlogic/pedal/loader/impl/FileSystemLoaderImpl.java
@@ -0,0 +1,32 @@
+package com.eclecticlogic.pedal.loader.impl;
+
+import javax.persistence.EntityManager;
+
+import com.eclecticlogic.pedal.loader.Loader;
+import com.eclecticlogic.pedal.loader.Script;
+
+/**
+ * Implementation of the {@link Loader} interface that finds the
+ * referred {@link Script}'s from the file system rather than
+ * the classpath.
+ * 
+ * @author Craig Setera
+ */
+public class FileSystemLoaderImpl extends AbstractLoaderImpl {
+
+	public FileSystemLoaderImpl() {
+		super();
+	}
+
+	public FileSystemLoaderImpl(EntityManager entityManager) {
+		super(entityManager);
+	}
+
+	@Override
+	protected AbstractScriptExecutor createScriptExecutor() {
+		FileSystemScriptExecutor executor = new FileSystemScriptExecutor(entityManager);
+	    executor.setScriptDirectory(scriptDirectory);
+	    executor.setCustomMethods(customMethods);
+	    return executor;
+	}
+}
diff --git a/src/main/java/com/eclecticlogic/pedal/loader/impl/FileSystemScriptExecutor.java b/src/main/java/com/eclecticlogic/pedal/loader/impl/FileSystemScriptExecutor.java
new file mode 100644
index 0000000..9917121
--- /dev/null
+++ b/src/main/java/com/eclecticlogic/pedal/loader/impl/FileSystemScriptExecutor.java
@@ -0,0 +1,39 @@
+package com.eclecticlogic.pedal.loader.impl;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.persistence.EntityManager;
+
+import com.eclecticlogic.pedal.loader.Script;
+
+/**
+ * Implementation of the {@link ScriptExecutor} interface that
+ * retrieves the script contents from the local file system.
+ * 
+ * @author Craig Setera
+ *
+ */
+public class FileSystemScriptExecutor extends AbstractScriptExecutor {
+
+	protected FileSystemScriptExecutor(EntityManager manager) {
+		super(manager);
+	}
+
+	@Override
+	protected InputStream getScriptStream(Script script) 
+		throws IOException 
+	{
+		File scriptSource = null;
+		if (scriptDirectory == null || scriptDirectory.trim().length() == 0) {
+			scriptSource = new File(script.getName());
+		} else {
+			File directory = new File(scriptDirectory.trim());
+			scriptSource = new File(directory, script.getName());
+		}
+
+        return new FileInputStream(scriptSource);
+	}
+}
diff --git a/src/main/java/com/eclecticlogic/pedal/loader/impl/LoaderImpl.java b/src/main/java/com/eclecticlogic/pedal/loader/impl/LoaderImpl.java
index 917f57d..460e481 100644
--- a/src/main/java/com/eclecticlogic/pedal/loader/impl/LoaderImpl.java
+++ b/src/main/java/com/eclecticlogic/pedal/loader/impl/LoaderImpl.java
@@ -16,19 +16,10 @@
  */
 package com.eclecticlogic.pedal.loader.impl;
 
-import groovy.lang.Closure;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
 import javax.annotation.ManagedBean;
 import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
 
 import com.eclecticlogic.pedal.loader.Loader;
-import com.eclecticlogic.pedal.loader.LoaderExecutor;
-import com.eclecticlogic.pedal.loader.Script;
 
 /**
  * Data loader entry class.
@@ -37,81 +28,20 @@
  *
  */
 @ManagedBean
-public class LoaderImpl implements Loader {
-
-    private String scriptDirectory;
-    @PersistenceContext
-    private EntityManager entityManager;
-
-    private Map<String, Closure<Object>> customMethods = new HashMap<>();
-
+public class LoaderImpl extends AbstractLoaderImpl implements Loader {
 
     public LoaderImpl() {
         super();
     }
 
-
     public LoaderImpl(EntityManager entityManager) {
-        super();
-        this.entityManager = entityManager;
-    }
-
-
-    public void setEntityManager(EntityManager entityManager) {
-        this.entityManager = entityManager;
-    }
-
-
-    @Override
-    public Loader withScriptDirectory(String directory) {
-        scriptDirectory = directory;
-        return this;
-    }
-
-
-    @Override
-    public Loader withCustomMethod(String methodName, Closure<Object> closure) {
-        customMethods.put(methodName, closure);
-        return this;
-    }
-
-
-    private ScriptExecutor createScriptExecutor() {
-        ScriptExecutor executor = new ScriptExecutor(entityManager);
-        executor.setScriptDirectory(scriptDirectory);
-        executor.setCustomMethods(customMethods);
-        return executor;
-    }
-
-
-    @Override
-    public LoaderExecutor withInputs(Map<String, Object> inputs) {
-        ScriptExecutor executor = createScriptExecutor();
-        executor.setInputs(inputs);
-        return executor;
-    }
-
-
-    @Override
-    public Map<String, Object> load(String loadScript, String... additionalScripts) {
-        return createScriptExecutor().load(loadScript, additionalScripts);
-    }
-
-
-    @Override
-    public Map<String, Object> load(Script script, Script... additionalScripts) {
-        return createScriptExecutor().load(script, additionalScripts);
-    }
-
-
-    @Override
-    public Map<String, Object> load(Collection<String> loadScripts) {
-        return createScriptExecutor().load(loadScripts);
-    }
-
-
-    @Override
-    public Map<String, Object> loadNamespaced(Collection<Script> loadScripts) {
-        return createScriptExecutor().loadNamespaced(loadScripts);
-    }
+        super(entityManager);
+    }
+    
+	protected ScriptExecutor createScriptExecutor() {
+	    ScriptExecutor executor = new ScriptExecutor(entityManager);
+	    executor.setScriptDirectory(scriptDirectory);
+	    executor.setCustomMethods(customMethods);
+	    return executor;
+	}
 }
diff --git a/src/main/java/com/eclecticlogic/pedal/loader/impl/ScriptExecutor.java b/src/main/java/com/eclecticlogic/pedal/loader/impl/ScriptExecutor.java
index 60ceb38..0d9e399 100644
--- a/src/main/java/com/eclecticlogic/pedal/loader/impl/ScriptExecutor.java
+++ b/src/main/java/com/eclecticlogic/pedal/loader/impl/ScriptExecutor.java
@@ -16,331 +16,30 @@
  */
 package com.eclecticlogic.pedal.loader.impl;
 
-import groovy.lang.Binding;
-import groovy.lang.Closure;
-import groovy.lang.GroovyShell;
-
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Stack;
 
 import javax.persistence.EntityManager;
 
-import org.apache.commons.io.IOUtils;
-
-import com.eclecticlogic.pedal.loader.LoaderExecutor;
 import com.eclecticlogic.pedal.loader.Script;
 
 /**
  * @author kabram.
  */
-public class ScriptExecutor implements LoaderExecutor {
-
-    private String scriptDirectory;
-    private Stack<ScriptContext> scriptContextStack = new Stack<>();
-    private Stack<Map<String, Object>> scriptInputs = new Stack<>(); // used to pass inputs to scripts when defined using withInput
-
-    private Map<String, Object> inputs = new HashMap<>();
-
-    private EntityManager entityManager;
-    private Map<String, Closure<Object>> customMethods;
-
+public class ScriptExecutor extends AbstractScriptExecutor {
 
     public ScriptExecutor(EntityManager manager) {
-        this.entityManager = manager;
-    }
-
-
-    public void setScriptDirectory(String scriptDirectory) {
-        this.scriptDirectory = scriptDirectory;
-    }
-
-
-    public void setInputs(Map<String, Object> inputs) {
-        this.inputs = inputs;
-    }
-
-
-    public void setCustomMethods(Map<String, Closure<Object>> customMethods) {
-        this.customMethods = customMethods;
-    }
-
-
-    @Override
-    public Map<String, Object> load(String loadScript, String... additionalScripts) {
-        List<String> scripts = new ArrayList<>();
-        scripts.add(loadScript);
-        if (additionalScripts != null) {
-            for (int i = 0; i < additionalScripts.length; i++) {
-                scripts.add(additionalScripts[i]);
-            }
-        }
-
-        return load(scripts);
-    }
-
-
-    @Override
-    public Map<String, Object> load(Script script, Script... additionalScripts) {
-        List<Script> scripts = new ArrayList<>();
-        scripts.add(script);
-        if (additionalScripts != null) {
-            for (int i = 0; i < additionalScripts.length; i++) {
-                scripts.add(additionalScripts[i]);
-            }
-        }
-        return loadNamespaced(scripts);
-    }
-
-
-    @Override
-    public Map<String, Object> load(Collection<String> loadScripts) {
-        List<Script> scripts = new ArrayList<>();
-        for (String script : loadScripts) {
-            scripts.add(Script.script(script));
-        }
-        return loadNamespaced(scripts);
-    }
-
-
-    @Override
-    public Map<String, Object> loadNamespaced(Collection<Script> scripts) {
-        Map<String, Object> variables = new HashMap<>();
-        // Add overall variables
-        Map<String, Object> inputVariables = scriptInputs.isEmpty() ? inputs : scriptInputs.pop();
-
-        for (Entry<String, Object> var : inputVariables.entrySet()) {
-            variables.put(var.getKey(), var.getValue());
-        }
-
-        for (Script script : scripts) {
-            NamespacedBinding binding = create();
-            // Bind inputs.
-            for (String key : variables.keySet()) {
-                binding.setVariable(key, variables.get(key));
-            }
-            binding.startCapture();
-
-            String filename = scriptDirectory == null || scriptDirectory.trim().length() == 0 ? script.getName()
-                    : scriptDirectory + File.separator + script.getName();
-            try (InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(filename)) {
-                List<String> lines = IOUtils.readLines(stream);
-                StringBuilder builder = new StringBuilder();
-                for (String line : lines) {
-                    builder.append(line).append("\n");
-                }
-                execute(builder.toString(), binding);
-            } catch (IOException e) {
-                throw new RuntimeException(e.getMessage(), e);
-            }
-
-            // Add output variables
-            if (script.getNamespace() == null || script.getNamespace().trim().length() == 0) {
-                for (String key : binding.getNamespacedVariables().keySet()) {
-                    variables.put(key, binding.getNamespacedVariables().get(key));
-                }
-            } else {
-                variables.put(script.getNamespace(), binding.getNamespacedVariables());
-            }
-        }
-
-        return variables;
-    }
-
-
-    @SuppressWarnings("serial")
-    private NamespacedBinding create() {
-        Closure<List<Object>> table = new Closure<List<Object>>(this) {
-
-            @SuppressWarnings("unchecked")
-            @Override
-            public List<Object> call(Object... args) {
-                if (args == null || args.length != 3) {
-                    throw new RuntimeException("The table method expects JPA entity class reference, "
-                            + "list of bean properties and a closure");
-                }
-                return invokeWithClosure((Class<?>) args[0], (List<String>) args[1], (Closure<Void>) args[2]);
-            }
-        };
-
-        Closure<Object> row = new Closure<Object>(this) {
-
-            @Override
-            public Object call(Object... args) {
-                return invokeRowClosure(args);
-            }
-        };
-
-        Closure<Object> defaultRow = new Closure<Object>(this) {
-
-            @SuppressWarnings("unchecked")
-            @Override
-            public Object call(Object... args) {
-                invokeDefaultRowClosure((Closure<Object>) args[0]);
-                return null;
-            }
-        };
-
-        Closure<Object> find = new Closure<Object>(this) {
-
-            @SuppressWarnings("unchecked")
-            @Override
-            public Object call(Object... args) {
-                return invokeFindClosure((Class<? extends Serializable>) args[0], (Serializable) args[1]);
-            };
-        };
-
-        Closure<Object> withInput = new Closure<Object>(this) {
-
-            @Override
-            public Object call(Object... args) {
-                return invokeWithInputClosure(args[0]);
-            };
-        };
-
-        Closure<Object> load = new Closure<Object>(this) {
-
-            @Override
-            public Object call(Object... args) {
-                return invokeLoadClosure(args);
-            };
-        };
-
-        Closure<Object> flush = new Closure<Object>(this) {
-
-            @Override
-            public Object call(Object... args) {
-                entityManager.flush();
-                return null;
-            };
-        };
-
-        NamespacedBinding binding = new NamespacedBinding();
-        binding.setVariable("table", table);
-        binding.setVariable("row", row);
-        binding.setVariable("defaultRow", defaultRow);
-        binding.setVariable("find", find);
-        binding.setVariable("withInput", withInput);
-        binding.setVariable("load", load);
-        binding.setVariable("flush", flush);
-
-        // Custom methods
-        for (Entry<String, Closure<Object>> entry : customMethods.entrySet()) {
-            binding.setVariable(entry.getKey(), entry.getValue());
-        }
-        return binding;
-    }
-
-
-    @SuppressWarnings("unchecked")
-    public Map<String, Object> execute(String script, Binding binding) {
-        GroovyShell shell = new GroovyShell(getClass().getClassLoader(), binding);
-        shell.evaluate(script);
-        return binding.getVariables();
-    }
-
-
-    private <V> List<Object> invokeWithClosure(Class<?> clz, List<String> attributes, Closure<V> callable) {
-        ScriptContext context = new ScriptContext();
-        context.setEntityClass(clz);
-        context.setAttributes(attributes);
-
-        scriptContextStack.push(context);
-
-        callable.call();
-
-        scriptContextStack.pop();
-        return context.getCreatedEntities();
-    }
-
-
-    private void invokeDefaultRowClosure(Closure<Object> closure) {
-        scriptContextStack.peek().setDefaultRowClosure(closure);
-    }
-
-
-    private Object invokeRowClosure(Object... attributeValues) {
-        Serializable instance = instantiate();
-        DelegatingGroovyObjectSupport<Serializable> delegate = new DelegatingGroovyObjectSupport<Serializable>(instance);
-
-        for (int i = 0; i < scriptContextStack.peek().getAttributes().size(); i++) {
-            delegate.setProperty(scriptContextStack.peek().getAttributes().get(i), attributeValues[i]);
-        }
-        scriptContextStack.peek().getDefaultRowClosure().call(instance);
-        entityManager.persist(instance);
-        scriptContextStack.peek().getCreatedEntities().add(instance);
-        return instance;
-    }
-
-
-    private Object invokeFindClosure(Class<? extends Serializable> clz, Serializable id) {
-        return entityManager.find(clz, id);
-    }
-
-
-    @SuppressWarnings("unchecked")
-    private Object invokeWithInputClosure(Object arg) {
-        Map<String, Object> scriptInput = (Map<String, Object>) arg;
-        scriptInputs.push(scriptInput);
-        // Return a constrained set of operations that are possible. Returning owner will result in the entire set
-        // of methods in this class being exposed.
-        return new Object() {
-
-            @SuppressWarnings("unused")
-            public Map<String, Object> load(String loadScript, String... additionalScripts) {
-                return ScriptExecutor.this.load(loadScript, additionalScripts);
-            }
-
-
-            @SuppressWarnings("unused")
-            public Map<String, Object> load(Map<String, String> namespacedScripts) {
-                List<Script> scripts = new ArrayList<>();
-                for (Entry<String, String> entry : namespacedScripts.entrySet()) {
-                    scripts.add(Script.with(entry.getValue(), entry.getKey()));
-                }
-                return ScriptExecutor.this.loadNamespaced(scripts);
-            }
-        };
-    }
-
-
-    @SuppressWarnings("unchecked")
-    private Object invokeLoadClosure(Object[] args) {
-        if (args.length == 0) {
-            throw new IllegalArgumentException("The load() method should be called with a map of namespace and "
-                    + "script names or a list of one or more script names.");
-        } else if (args[0] instanceof Map) {
-            Map<String, String> scriptMap = (Map<String, String>) args[0];
-            List<Script> scripts = new ArrayList<>();
-            for (String namespace : scriptMap.keySet()) {
-                scripts.add(Script.with(scriptMap.get(namespace), namespace));
-            }
-            return loadNamespaced(scripts);
-        } else {
-            // Assuming these are simply script names.
-            List<String> scripts = new ArrayList<>();
-            for (int i = 0; i < args.length; i++) {
-                scripts.add((String) args[i]);
-            }
-            return load(scripts);
-        }
-    }
-
-
-    private Serializable instantiate() {
-        try {
-            return (Serializable) scriptContextStack.peek().getEntityClass().newInstance();
-        } catch (InstantiationException | IllegalAccessException e) {
-            throw new RuntimeException(e.getMessage(), e);
-        }
-    }
-
+        super(manager);
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see com.eclecticlogic.pedal.loader.impl.AbstractScriptExecutor#getScriptStream(com.eclecticlogic.pedal.loader.Script)
+     */
+	@Override
+	protected InputStream getScriptStream(Script script) {
+        String filename = scriptDirectory == null || scriptDirectory.trim().length() == 0 ? script.getName()
+                : scriptDirectory + File.separator + script.getName();
+        return Thread.currentThread().getContextClassLoader().getResourceAsStream(filename);
+	}
 }
diff --git a/src/test/java/com/eclecticlogic/pedal/loader/TestLoader.java b/src/test/java/com/eclecticlogic/pedal/loader/TestLoader.java
index 48dc31b..1a852ef 100644
--- a/src/test/java/com/eclecticlogic/pedal/loader/TestLoader.java
+++ b/src/test/java/com/eclecticlogic/pedal/loader/TestLoader.java
@@ -11,12 +11,16 @@
  **/
 package com.eclecticlogic.pedal.loader;
 
-import groovy.lang.Closure;
-
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Map;
 
+import javax.persistence.EntityManager;
 import javax.transaction.Transactional;
 
+import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -25,6 +29,9 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.eclecticlogic.pedal.loader.dm.SimpleType;
+import com.eclecticlogic.pedal.loader.impl.FileSystemLoaderImpl;
+
+import groovy.lang.Closure;
 
 /**
  * @author kabram.
@@ -33,11 +40,19 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = JpaConfiguration.class)
 public class TestLoader {
-
+	private static final String[] SCRIPT_FILE_NAMES = new String[] {
+		"customMethod.loader.groovy",
+		"input.reader.groovy",
+		"simple.loader.groovy",
+		"test.loader.groovy"
+	};
+	
     @Autowired
     private Loader loader;
 
-
+    @Autowired
+    private EntityManager entityManager;
+    
     @SuppressWarnings("unchecked")
     @Test
     @Transactional
@@ -56,13 +71,32 @@ public void testLoaderWithNamespaces() {
     @Test
     @Transactional
     public void testLoadWithinLoadScript() {
-        Map<String, Object> variables = loader.withScriptDirectory("loader") //
-                .load("test.loader.groovy");
+        Map<String, Object> variables = loader
+    		.withScriptDirectory("loader") 
+            .load("test.loader.groovy");
         Map<String, Object> output = (Map<String, Object>) variables.get("output");
         Map<String, Object> avars = (Map<String, Object>) output.get("a");
         Assert.assertEquals(((SimpleType) avars.get("simple1")).getAmount(), 10);
     }
 
+    @SuppressWarnings("unchecked")
+    @Test
+    @Transactional
+    public void testLoadFromFileSystem() 
+    	throws IOException 
+    {
+    	File tempFolder = copyScriptsToFilesystem();
+    	
+    	Loader fileSystemLoader = 
+    		new FileSystemLoaderImpl(entityManager);
+    	
+        Map<String, Object> variables = fileSystemLoader
+    		.withScriptDirectory(tempFolder.getAbsolutePath()) 
+            .load("test.loader.groovy");
+        Map<String, Object> output = (Map<String, Object>) variables.get("output");
+        Map<String, Object> avars = (Map<String, Object>) output.get("a");
+        Assert.assertEquals(((SimpleType) avars.get("simple1")).getAmount(), 10);
+    }
 
     @SuppressWarnings("serial")
     @Test
@@ -81,4 +115,31 @@ public Object call(Object... args) {
         Assert.assertEquals(variables.get("myvar"), 400);
     }
 
+    /**
+     * Copy the Pedal Loader test scripts from the classloader
+     * to the file system.
+     * 
+     * @return
+     * @throws IOException
+     */
+	private File copyScriptsToFilesystem() 
+		throws IOException 
+	{
+    	// Copy the test scripts to a temporary location on the file system...
+    	File tempFolder = File.createTempFile("pedalloader_", ".tst");
+    	tempFolder.delete();
+    	tempFolder.mkdirs();
+    	
+    	for (String name : SCRIPT_FILE_NAMES) {
+    		File outputFile = new File(tempFolder, name);
+    		
+    		try (InputStream scriptStream = getClass().getClassLoader().getResourceAsStream("loader/" + name)) {
+    			try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+    				IOUtils.copy(scriptStream, fos);
+    			}
+    		}
+    	}
+    	
+		return tempFolder;
+	}
 }