diff --git a/dynamicjava/.gitignore b/dynamicjava/.gitignore
index af2038d7e..f37492193 100644
--- a/dynamicjava/.gitignore
+++ b/dynamicjava/.gitignore
@@ -1,5 +1,5 @@
 classes/
-*.jar
+dynamicjava*.jar
 
 # Generated code
 src/edu/rice/cs/dynamicjava/symbol/type/*
diff --git a/dynamicjava/README.md b/dynamicjava/README.md
new file mode 100644
index 000000000..982288c0e
--- /dev/null
+++ b/dynamicjava/README.md
@@ -0,0 +1,41 @@
+# DynamicJava
+
+DynamicJava is a REPL for Java code.
+
+## IPython Kernel
+
+DynamicJava includes a built-in [IPython](http://ipython.org) kernel. The kernel enables execution of Java code in the IPython terminal application as well as in its web based [notebook interface](http://ipython.org/notebook.html).
+
+### Prerequisites
+
+1. Install IPython. It can be installed using `pip` with `pip install ipython` or through your package manager.
+
+2. Create a new IPython profile for DynamicJava. Run `ipython profile create dynamicjava`. This will create a new IPython profile in `.ipython/profile_dynamicjava`.
+
+3. Configure the new profile to run the DynamicJava kernel. Copy the following lines into `.ipython/profile_dynamicjava/ipython_config.py`, replacing `DYNAMICJAVA_PATH` with the file path of `dynamicjava.jar`. Any additional arguments to the JVM should be passed here.
+
+   ```
+   c.KernelManager.kernel_cmd = [
+       "java",
+       "-jar", "DYNAMICJAVA_PATH",
+       "-kernel", "{connection_file}"
+   ]
+   c.Session.key = b''
+   c.Session.keyfile = b''
+   ```
+   
+4. (Optional) To debug the kernel while it is running, add the following line to the `kernel_cmd` list.
+
+   ```
+   "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044",
+   ```
+   
+   To use the debugger, follow the instructions to configure remote debugging for your IDE ([Eclipse](http://help.eclipse.org/luna/index.jsp?topic=%2Forg.eclipse.jdt.doc.user%2Ftasks%2Ftask-remotejava_launch_config.htm), [IntelliJ](https://www.jetbrains.com/idea/help/run-debug-configuration-remote.html))
+   
+5. Configure the IPython Notebook Java syntax highlighting. Copy the files in `profile/static/custom/` to `.ipython/profile_dynamicjava/static/custom/`.
+
+### Building and Running
+
+* To build the kernel, run `ant jar`.
+* The IPython console frontend can be run with `ipython console --profile dynamicjava`.
+* To run the web interface, run `ipython notebook --profile dynamicjava`.
diff --git a/dynamicjava/build.xml b/dynamicjava/build.xml
index 9708ab4f6..bc412c9c0 100644
--- a/dynamicjava/build.xml
+++ b/dynamicjava/build.xml
@@ -32,7 +32,6 @@
   
   <property environment="env" />
   <property name="java6-home" value="${env.JAVA6_HOME}" />
-  <property name="java5-home" value="${env.JAVA5_HOME}" />
   <property name="javacc-home"  value="${env.JAVACC_HOME}" />
   <property name="clover-jar" value="${env.CLOVER_JAR}" />
   <property name="findbugs-home" value="${env.FINDBUGS_HOME}" />
@@ -76,8 +75,6 @@
     <echo message="      the 'java' command is used by default in testing/running; " />
     <echo message="      the 'svn' command is used to generate version numbers and " />
     <echo message="      in Subversion targets" />
-    <echo message="JAVA5_HOME: Home folder of the Java 5 JRE or JDK (required for" />
-    <echo message="            compiling and '-5' targets)" />
     <echo message="JAVA6_HOME: Home folder of the Java 6 JRE or JDK (required for" />
     <echo message="            '-6' targets)" />
     <echo message="JAVACC_HOME: Top-level directory of JavaCC (version 4.1+ is preferred)" />
@@ -165,15 +162,22 @@
     <echo message="Processing ${version-source}" />
     <copy file="${version-source}" tofile="${version-target}" filtering="yes" />
     
-    <antcall target="generate-ast">
-      <param name="generate-sourcefile" value="${type-ast}" />
-      <param name="generate-dir" value="${type-ast-dir}" />
-    </antcall>
+    <taskdef name="astgen" classpath="lib/buildlib/astgen.jar" classname="edu.rice.cs.astgen.AntTask" />
+    <echo message="Processing ${type-ast}" />
+    <delete dir="${type-ast-dir}" />
+    <mkdir dir="${type-ast-dir}" />
+    <astgen file="${type-ast}" />
     
-    <antcall target="generate-parser">
-      <param name="generate-sourcefile" value="${dynamicjava-parser}" />
-      <param name="generate-dir" value="${dynamicjava-parser-dir}" />
-    </antcall>
+    <echo message="Generating parser from ${dynamicjava-parser}" />
+    <delete dir="${dynamicjava-parser-dir}" />
+    <mkdir dir="${dynamicjava-parser-dir}" />
+    <javacc target="${dynamicjava-parser}"
+            outputdirectory="${dynamicjava-parser-dir}"
+            javacchome="${javacc-home}" />
+    <!-- Fix problems in generated code that cause compiler warnings (occurs in javacc 4.1) -->
+    <replace dir="${dynamicjava-parser-dir}"
+             token="int hiByte = (int)(curChar >> 8);"
+             value="int hiByte = curChar >> 8;" />
     
     <!-- Any additional files to be generated may be processed here -->
 
@@ -191,30 +195,7 @@
     <include name="${dynamicjava-parser-dir}" />
     <!-- Additional generated sources should be listed here -->
   </patternset>
-
-  <!-- Must be called from an antcall -->
-  <target name="generate-parser" depends="check-generate-dir-from-file" unless="already-generated">
-    <echo message="Processing ${generate-sourcefile}" />
-    <delete dir="${generate-dir}" />
-    <mkdir dir="${generate-dir}" />
-    <javacc target="${generate-sourcefile}" outputdirectory="${generate-dir}" javacchome="${javacc-home}" />
-    <!-- Fix problems in generated code that cause compiler warnings (occurs in javacc 4.1) -->
-    <replace dir="${generate-dir}"
-             token="int hiByte = (int)(curChar >> 8);"
-             value="int hiByte = curChar >> 8;" />
-  </target>
-   
-  <!-- Must be called from an antcall -->
-  <target name="generate-ast" depends="check-generate-dir-from-file" unless="already-generated">
-    <taskdef name="astgen" classpath="lib/buildlib/astgen.jar" classname="edu.rice.cs.astgen.AntTask" />
-    <echo message="Processing ${generate-sourcefile}" />
-    <delete dir="${generate-dir}" />
-    <mkdir dir="${generate-dir}" />
-    <astgen file="${generate-sourcefile}" />
-  </target>
-  
-  
-  
+     
   <!-- *******************
        Compilation Targets
        ******************* -->
@@ -223,7 +204,7 @@
           description="Compile all source files (after generating the source)">
   </target>
   
-  <target name="do-compile" depends="resolve-java5-runtime">
+  <target name="do-compile" depends="resolve-java6-runtime">
   
     <echo message="Compiling src directory to classes/base and classes/test with command 'javac'" />
     
@@ -235,8 +216,8 @@
       <fileset dir="classes/test" includes="**/*" />
     </move>
     
-    <javac srcdir="src" destdir="classes/base" source="1.5" target="1.5"
-           bootclasspath="${java5-runtime}" sourcepath="" includeAntRuntime="no"
+    <javac srcdir="src" destdir="classes/base" source="1.6" target="1.6"
+           bootclasspath="${java6-runtime}" sourcepath="" includeAntRuntime="no"
            executable="javac" fork="yes" memoryMaximumSize="512M"
            debug="on" optimize="off" deprecation="on"	>
       <classpath>
@@ -320,15 +301,7 @@
     <antcall target="iterate-tests">
       <param name="test-jvm" value="${java6-exec}" />
     </antcall>
-  </target>
-  
-  <target name="test-5" depends="compile, resolve-java5-exec" unless="skip-test"
-          description="Run all tests under Java 5 (after compiling); use -Dtest-spec=... to filter">
-    <antcall target="iterate-tests">
-      <param name="test-jvm" value="${java5-exec}" />
-    </antcall>
-  </target>
-  
+  </target>  
   
   <target name="iterate-tests" depends="resolve-test-formatter-class">
     <!-- Calls do-test, unless that is overridden by the caller -->
@@ -502,8 +475,8 @@
         <pathelement location="lib/buildlib/junit.jar" />
         <pathelement location="lib/buildlib/jlbench-base.jar" />
       </classpath>
-      <link href="http://java.sun.com/j2se/1.5/docs/api" />
-      <link href="http://junit.org/junit/javadoc/3.8.1" />
+      <link href="http://docs.oracle.com/javase/6/docs/api/" />
+      <link href="http://junit.org/apidocs/index.html" />
       <link href="http://drjava.org/javadoc/plt" />
       <!-- Additional external library APIs may be listed here -->
     </javadoc>
@@ -515,10 +488,7 @@
   
   <target name="clover-6" depends="clean, setup-clover, test-6, report-clover" 
           description="Generate a Clover test coverage report under Java 6" />
-  
-  <target name="clover-5" depends="clean, setup-clover, test-5, report-clover" 
-          description="Generate a Clover test coverage report under Java 5" />
-  
+    
   <target name="report-clover" depends="resolve-version-tag">
     <echo message="Generating Clover report" />
     <clover-report>
@@ -843,16 +813,15 @@
   <!-- ***************************
        Property-resolution Targets 
        *************************** -->
-  
-  <target name="resolve-java6-runtime">
+    <target name="resolve-java6-runtime">
     <!-- We rely on "location" to generate a platform-specific path; note that properties
          are immutable and so java6-runtime will only be set the *first* time. -->
 
     <property name="java6-runtime-1" location="${java6-home}/lib/rt.jar" />
-    <available property="java5-runtime" value="${java6-runtime-1}" file="${java6-runtime-1}" />
+    <available property="java6-runtime" value="${java6-runtime-1}" file="${java6-runtime-1}" />
 
     <property name="java6-runtime-2" location="${java6-home}/jre/lib/rt.jar" />
-    <available property="java5-runtime" value="${java6-runtime-2}" file="${java6-runtime-2}" />
+    <available property="java6-runtime" value="${java6-runtime-2}" file="${java6-runtime-2}" />
 
     <property name="java6-runtime-3" location="${java6-home}/../Classes/classes.jar" />
     <available property="java6-runtime" value="${java6-runtime-3}" file="${java6-runtime-3}" />
@@ -877,39 +846,6 @@
     <fail message="Can't find the java executable in the Java 6 home: ${java6-home}" unless="java6-exec" />
   </target>
   
-  <target name="resolve-java5-runtime">
-    <!-- We rely on "location" to generate a platform-specific path; note that properties
-         are immutable and so java5-runtime will only be set the *first* time. -->
-
-    <property name="java5-runtime-1" location="${java5-home}/lib/rt.jar" />
-    <available property="java5-runtime" value="${java5-runtime-1}" file="${java5-runtime-1}" />
-
-    <property name="java5-runtime-2" location="${java5-home}/jre/lib/rt.jar" />
-    <available property="java5-runtime" value="${java5-runtime-2}" file="${java5-runtime-2}" />
-
-    <property name="java5-runtime-3" location="${java5-home}/../Classes/classes.jar" />
-    <available property="java5-runtime" value="${java5-runtime-3}" file="${java5-runtime-3}" />
-
-    <fail message="Can't find rt.jar in the Java 5 home: ${java5-home}" unless="java5-runtime" />
-  </target>
-  
-  <target name="resolve-java5-exec">
-    <!-- We rely on "location" to generate a platform-specific path -->
-
-    <property name="java5-exec-1" location="${java5-home}/bin/java.exe" />
-    <condition property="java5-exec" value="${java5-exec-1}">
-      <and>
-        <available file="${java5-exec-1}" />
-        <os family="windows" />
-      </and>
-    </condition>
-    
-    <property name="java5-exec-2" location="${java5-home}/bin/java" />
-    <available property="java5-exec" value="${java5-exec-2}" file="${java5-exec-2}" />
-
-    <fail message="Can't find the java executable in the Java 5 home: ${java5-home}" unless="java5-exec" />
-  </target>
-  
   
   <target name="assert-jar-exists">
     <available property="jar-exists" file="${ant.project.name}.jar" />
@@ -994,13 +930,7 @@
   
   <!-- Sets svn-revision to the current "Last Changed Rev" of "svn info". -->
   <target name="resolve-svn-revision">
-  <!-- do nothing -->
-  </target>
-  
-<!-- superseded old code
-  <!- Sets svn-revision to the current "Last Changed Rev" of "svn info". ->
-  <target name="resolve-svn-revision">
-    <exec executable="svn" failonerror="yes" output="svn-info.txt">
+    <exec executable="svn" failonerror="no" output="svn-info.txt">
       <arg value="info" />
     </exec>
     <loadfile property="svn-revision" srcfile="svn-info.txt">
@@ -1014,7 +944,7 @@
     </loadfile>
     <delete file="svn-info.txt" />
   </target>
--->
+  
 
   <!-- Sets "already-generated" if "generate-file" is more recent than "generate-sourcefile";
        otherwise, the out-of-date target file is deleted (if it exists).  Note that, since
diff --git a/dynamicjava/lib/json-20140107.jar b/dynamicjava/lib/json-20140107.jar
new file mode 100644
index 000000000..40a325dba
Binary files /dev/null and b/dynamicjava/lib/json-20140107.jar differ
diff --git a/dynamicjava/lib/jzmq-3.0.1.jar b/dynamicjava/lib/jzmq-3.0.1.jar
new file mode 100644
index 000000000..43f9b9801
Binary files /dev/null and b/dynamicjava/lib/jzmq-3.0.1.jar differ
diff --git a/dynamicjava/lib/plt.jar b/dynamicjava/lib/plt.jar
index c8f8303b9..1c1732c13 100644
Binary files a/dynamicjava/lib/plt.jar and b/dynamicjava/lib/plt.jar differ
diff --git a/dynamicjava/profile/ipython_config.py b/dynamicjava/profile/ipython_config.py
new file mode 100644
index 000000000..9f892626a
--- /dev/null
+++ b/dynamicjava/profile/ipython_config.py
@@ -0,0 +1,538 @@
+# Configuration file for ipython.
+
+c = get_config()
+
+#------------------------------------------------------------------------------
+# InteractiveShellApp configuration
+#------------------------------------------------------------------------------
+
+# A Mixin for applications that start InteractiveShell instances.
+# 
+# Provides configurables for loading extensions and executing files as part of
+# configuring a Shell environment.
+# 
+# The following methods should be called by the :meth:`initialize` method of the
+# subclass:
+# 
+#   - :meth:`init_path`
+#   - :meth:`init_shell` (to be implemented by the subclass)
+#   - :meth:`init_gui_pylab`
+#   - :meth:`init_extensions`
+#   - :meth:`init_code`
+
+# lines of code to run at IPython startup.
+# c.InteractiveShellApp.exec_lines = []
+
+# dotted module name of an IPython extension to load.
+# c.InteractiveShellApp.extra_extension = ''
+
+# Should variables loaded at startup (by startup files, exec_lines, etc.) be
+# hidden from tools like %who?
+# c.InteractiveShellApp.hide_initial_ns = True
+
+# Enable GUI event loop integration with any of ('glut', 'gtk', 'gtk3', 'none',
+# 'osx', 'pyglet', 'qt', 'qt4', 'tk', 'wx').
+# c.InteractiveShellApp.gui = None
+
+# If true, IPython will populate the user namespace with numpy, pylab, etc. and
+# an ``import *`` is done from numpy and pylab, when using pylab mode.
+# 
+# When False, pylab mode should not import any names into the user namespace.
+# c.InteractiveShellApp.pylab_import_all = True
+
+# A list of dotted module names of IPython extensions to load.
+# c.InteractiveShellApp.extensions = []
+
+# List of files to run at IPython startup.
+# c.InteractiveShellApp.exec_files = []
+
+# Run the module as a script.
+# c.InteractiveShellApp.module_to_run = ''
+
+# Execute the given command string.
+# c.InteractiveShellApp.code_to_run = ''
+
+# Pre-load matplotlib and numpy for interactive use, selecting a particular
+# matplotlib backend and loop integration.
+# c.InteractiveShellApp.pylab = None
+
+# Run the file referenced by the PYTHONSTARTUP environment variable at IPython
+# startup.
+# c.InteractiveShellApp.exec_PYTHONSTARTUP = True
+
+# Configure matplotlib for interactive use with the default matplotlib backend.
+# c.InteractiveShellApp.matplotlib = None
+
+# A file to be run
+# c.InteractiveShellApp.file_to_run = ''
+
+#------------------------------------------------------------------------------
+# TerminalIPythonApp configuration
+#------------------------------------------------------------------------------
+
+# TerminalIPythonApp will inherit config from: BaseIPythonApplication,
+# Application, InteractiveShellApp
+
+# lines of code to run at IPython startup.
+# c.TerminalIPythonApp.exec_lines = []
+
+# The name of the IPython directory. This directory is used for logging
+# configuration (through profiles), history storage, etc. The default is usually
+# $HOME/.ipython. This options can also be specified through the environment
+# variable IPYTHONDIR.
+# c.TerminalIPythonApp.ipython_dir = ''
+
+# Should variables loaded at startup (by startup files, exec_lines, etc.) be
+# hidden from tools like %who?
+# c.TerminalIPythonApp.hide_initial_ns = True
+
+# If true, IPython will populate the user namespace with numpy, pylab, etc. and
+# an ``import *`` is done from numpy and pylab, when using pylab mode.
+# 
+# When False, pylab mode should not import any names into the user namespace.
+# c.TerminalIPythonApp.pylab_import_all = True
+
+# Whether to install the default config files into the profile dir. If a new
+# profile is being created, and IPython contains config files for that profile,
+# then they will be staged into the new directory.  Otherwise, default config
+# files will be automatically generated.
+# c.TerminalIPythonApp.copy_config_files = False
+
+# Pre-load matplotlib and numpy for interactive use, selecting a particular
+# matplotlib backend and loop integration.
+# c.TerminalIPythonApp.pylab = None
+
+# Start IPython quickly by skipping the loading of config files.
+# c.TerminalIPythonApp.quick = False
+
+# Enable GUI event loop integration with any of ('glut', 'gtk', 'gtk3', 'none',
+# 'osx', 'pyglet', 'qt', 'qt4', 'tk', 'wx').
+# c.TerminalIPythonApp.gui = None
+
+# Create a massive crash report when IPython encounters what may be an internal
+# error.  The default is to append a short message to the usual traceback
+# c.TerminalIPythonApp.verbose_crash = False
+
+# The date format used by logging formatters for %(asctime)s
+# c.TerminalIPythonApp.log_datefmt = '%Y-%m-%d %H:%M:%S'
+
+# A file to be run
+# c.TerminalIPythonApp.file_to_run = ''
+
+# If a command or file is given via the command-line, e.g. 'ipython foo.py',
+# start an interactive shell after executing the file or command.
+# c.TerminalIPythonApp.force_interact = False
+
+# The Logging format template
+# c.TerminalIPythonApp.log_format = '[%(name)s]%(highlevel)s %(message)s'
+
+# dotted module name of an IPython extension to load.
+# c.TerminalIPythonApp.extra_extension = ''
+
+# Suppress warning messages about legacy config files
+# c.TerminalIPythonApp.ignore_old_config = False
+
+# Path to an extra config file to load.
+# 
+# If specified, load this config file in addition to any other IPython config.
+# c.TerminalIPythonApp.extra_config_file = ''
+
+# Whether to display a banner upon starting IPython.
+# c.TerminalIPythonApp.display_banner = True
+
+# List of files to run at IPython startup.
+# c.TerminalIPythonApp.exec_files = []
+
+# Run the module as a script.
+# c.TerminalIPythonApp.module_to_run = ''
+
+# The IPython profile to use.
+# c.TerminalIPythonApp.profile = 'default'
+
+# Execute the given command string.
+# c.TerminalIPythonApp.code_to_run = ''
+
+# Set the log level by value or name.
+# c.TerminalIPythonApp.log_level = 30
+
+# Run the file referenced by the PYTHONSTARTUP environment variable at IPython
+# startup.
+# c.TerminalIPythonApp.exec_PYTHONSTARTUP = True
+
+# Configure matplotlib for interactive use with the default matplotlib backend.
+# c.TerminalIPythonApp.matplotlib = None
+
+# A list of dotted module names of IPython extensions to load.
+# c.TerminalIPythonApp.extensions = []
+
+# Whether to overwrite existing config files when copying
+# c.TerminalIPythonApp.overwrite = False
+
+#------------------------------------------------------------------------------
+# TerminalInteractiveShell configuration
+#------------------------------------------------------------------------------
+
+# TerminalInteractiveShell will inherit config from: InteractiveShell
+
+# Number of lines of your screen, used to control printing of very long strings.
+# Strings longer than this number of lines will be sent through a pager instead
+# of directly printed.  The default value for this is 0, which means IPython
+# will auto-detect your screen size every time it needs to print certain
+# potentially long strings (this doesn't change the behavior of the 'print'
+# keyword, it's only triggered internally). If for some reason this isn't
+# working well (it needs curses support), specify it yourself. Otherwise don't
+# change the default.
+# c.TerminalInteractiveShell.screen_length = 0
+
+# Autoindent IPython code entered interactively.
+# c.TerminalInteractiveShell.autoindent = True
+
+# 
+# c.TerminalInteractiveShell.wildcards_case_sensitive = True
+
+# The part of the banner to be printed after the profile
+# c.TerminalInteractiveShell.banner2 = ''
+
+# 
+# c.TerminalInteractiveShell.readline_parse_and_bind = ['tab: complete', '"\\C-l": clear-screen', 'set show-all-if-ambiguous on', '"\\C-o": tab-insert', '"\\C-r": reverse-search-history', '"\\C-s": forward-search-history', '"\\C-p": history-search-backward', '"\\C-n": history-search-forward', '"\\e[A": history-search-backward', '"\\e[B": history-search-forward', '"\\C-k": kill-line', '"\\C-u": unix-line-discard']
+
+# 
+# c.TerminalInteractiveShell.ipython_dir = ''
+
+# The part of the banner to be printed before the profile
+# c.TerminalInteractiveShell.banner1 = 'Python 3.4.2 (default, Oct 20 2014, 14:33:09) \nType "copyright", "credits" or "license" for more information.\n\nIPython 2.3.0 -- An enhanced Interactive Python.\n?         -> Introduction and overview of IPython\'s features.\n%quickref -> Quick reference.\nhelp      -> Python\'s own help system.\nobject?   -> Details about \'object\', use \'object??\' for extra details.\n'
+
+# 
+# c.TerminalInteractiveShell.history_length = 10000
+
+# Show rewritten input, e.g. for autocall.
+# c.TerminalInteractiveShell.show_rewritten_input = True
+
+# 
+# c.TerminalInteractiveShell.object_info_string_level = 0
+
+# Save multi-line entries as one entry in readline history
+# c.TerminalInteractiveShell.multiline_history = True
+
+# 
+# c.TerminalInteractiveShell.debug = False
+
+# Set the color scheme (NoColor, Linux, or LightBG).
+# c.TerminalInteractiveShell.colors = 'LightBG'
+
+# 
+# c.TerminalInteractiveShell.quiet = False
+
+# Enable auto setting the terminal title.
+# c.TerminalInteractiveShell.term_title = False
+
+# Automatically call the pdb debugger after every exception.
+# c.TerminalInteractiveShell.pdb = False
+
+# The name of the logfile to use.
+# c.TerminalInteractiveShell.logfile = ''
+
+# 
+# c.TerminalInteractiveShell.separate_in = '\n'
+
+# auto editing of files with syntax errors.
+# c.TerminalInteractiveShell.autoedit_syntax = False
+
+# Deprecated, use PromptManager.justify
+# c.TerminalInteractiveShell.prompts_pad_left = True
+
+# Set the editor used by IPython (default to $EDITOR/vi/notepad).
+# c.TerminalInteractiveShell.editor = '/usr/bin/nano'
+
+# 
+# c.TerminalInteractiveShell.readline_use = True
+
+# Don't call post-execute functions that have failed in the past.
+# c.TerminalInteractiveShell.disable_failing_post_execute = False
+
+# Deprecated, use PromptManager.in2_template
+# c.TerminalInteractiveShell.prompt_in2 = '   .\\D.: '
+
+# Enable magic commands to be called without the leading %.
+# c.TerminalInteractiveShell.automagic = True
+
+# 
+# c.TerminalInteractiveShell.xmode = 'Context'
+
+# Make IPython automatically call any callable object even if you didn't type
+# explicit parentheses. For example, 'str 43' becomes 'str(43)' automatically.
+# The value can be '0' to disable the feature, '1' for 'smart' autocall, where
+# it is not applied if there are no more arguments on the line, and '2' for
+# 'full' autocall, where all callable objects are automatically called (even if
+# no arguments are present).
+# c.TerminalInteractiveShell.autocall = 0
+
+# The shell program to be used for paging.
+# c.TerminalInteractiveShell.pager = 'less'
+
+# Start logging to the default log file.
+# c.TerminalInteractiveShell.logstart = False
+
+# Use colors for displaying information about objects. Because this information
+# is passed through a pager (like 'less'), and some pagers get confused with
+# color codes, this capability can be turned off.
+# c.TerminalInteractiveShell.color_info = True
+
+# A list of ast.NodeTransformer subclass instances, which will be applied to
+# user input before code is run.
+# c.TerminalInteractiveShell.ast_transformers = []
+
+# Deprecated, use PromptManager.out_template
+# c.TerminalInteractiveShell.prompt_out = 'Out[\\#]: '
+
+# Set to confirm when you try to exit IPython with an EOF (Control-D in Unix,
+# Control-Z/Enter in Windows). By typing 'exit' or 'quit', you can force a
+# direct exit without any confirmation.
+# c.TerminalInteractiveShell.confirm_exit = True
+
+# Deprecated, use PromptManager.in_template
+# c.TerminalInteractiveShell.prompt_in1 = 'In [\\#]: '
+
+# Start logging to the given file in append mode.
+# c.TerminalInteractiveShell.logappend = ''
+
+# Set the size of the output cache.  The default is 1000, you can change it
+# permanently in your config file.  Setting it to 0 completely disables the
+# caching system, and the minimum value accepted is 20 (if you provide a value
+# less than 20, it is reset to 0 and a warning is issued).  This limit is
+# defined because otherwise you'll spend more time re-flushing a too small cache
+# than working
+# c.TerminalInteractiveShell.cache_size = 1000
+
+# Enable deep (recursive) reloading by default. IPython can use the deep_reload
+# module which reloads changes in modules recursively (it replaces the reload()
+# function, so you don't need to change anything to use it). deep_reload()
+# forces a full reload of modules whose code may have changed, which the default
+# reload() function does not.  When deep_reload is off, IPython will use the
+# normal reload(), but deep_reload will still be available as dreload().
+# c.TerminalInteractiveShell.deep_reload = False
+
+# 
+# c.TerminalInteractiveShell.readline_remove_delims = '-/~'
+
+# 'all', 'last', 'last_expr' or 'none', specifying which nodes should be run
+# interactively (displaying output from expressions).
+# c.TerminalInteractiveShell.ast_node_interactivity = 'last_expr'
+
+# 
+# c.TerminalInteractiveShell.separate_out = ''
+
+# 
+# c.TerminalInteractiveShell.separate_out2 = ''
+
+#------------------------------------------------------------------------------
+# PromptManager configuration
+#------------------------------------------------------------------------------
+
+# This is the primary interface for producing IPython's prompts.
+
+# Continuation prompt.
+# c.PromptManager.in2_template = '   .\\D.: '
+
+# If True (default), each prompt will be right-aligned with the preceding one.
+# c.PromptManager.justify = True
+
+# 
+# c.PromptManager.color_scheme = 'Linux'
+
+# Input prompt.  '\#' will be transformed to the prompt number
+# c.PromptManager.in_template = 'In [\\#]: '
+
+# Output prompt. '\#' will be transformed to the prompt number
+# c.PromptManager.out_template = 'Out[\\#]: '
+
+#------------------------------------------------------------------------------
+# HistoryManager configuration
+#------------------------------------------------------------------------------
+
+# A class to organize all history-related functionality in one place.
+
+# HistoryManager will inherit config from: HistoryAccessor
+
+# Should the history database include output? (default: no)
+# c.HistoryManager.db_log_output = False
+
+# Path to file to use for SQLite history database.
+# 
+# By default, IPython will put the history database in the IPython profile
+# directory.  If you would rather share one history among profiles, you can set
+# this value in each, so that they are consistent.
+# 
+# Due to an issue with fcntl, SQLite is known to misbehave on some NFS mounts.
+# If you see IPython hanging, try setting this to something on a local disk,
+# e.g::
+# 
+#     ipython --HistoryManager.hist_file=/tmp/ipython_hist.sqlite
+# c.HistoryManager.hist_file = ''
+
+# enable the SQLite history
+# 
+# set enabled=False to disable the SQLite history, in which case there will be
+# no stored history, no SQLite connection, and no background saving thread.
+# This may be necessary in some threaded environments where IPython is embedded.
+# c.HistoryManager.enabled = True
+
+# Options for configuring the SQLite connection
+# 
+# These options are passed as keyword args to sqlite3.connect when establishing
+# database conenctions.
+# c.HistoryManager.connection_options = {}
+
+# Write to database every x commands (higher values save disk access & power).
+# Values of 1 or less effectively disable caching.
+# c.HistoryManager.db_cache_size = 0
+
+#------------------------------------------------------------------------------
+# ProfileDir configuration
+#------------------------------------------------------------------------------
+
+# An object to manage the profile directory and its resources.
+# 
+# The profile directory is used by all IPython applications, to manage
+# configuration, logging and security.
+# 
+# This object knows how to find, create and manage these directories. This
+# should be used by any code that wants to handle profiles.
+
+# Set the profile location directly. This overrides the logic used by the
+# `profile` option.
+# c.ProfileDir.location = ''
+
+#------------------------------------------------------------------------------
+# PlainTextFormatter configuration
+#------------------------------------------------------------------------------
+
+# The default pretty-printer.
+# 
+# This uses :mod:`IPython.lib.pretty` to compute the format data of the object.
+# If the object cannot be pretty printed, :func:`repr` is used. See the
+# documentation of :mod:`IPython.lib.pretty` for details on how to write pretty
+# printers.  Here is a simple example::
+# 
+#     def dtype_pprinter(obj, p, cycle):
+#         if cycle:
+#             return p.text('dtype(...)')
+#         if hasattr(obj, 'fields'):
+#             if obj.fields is None:
+#                 p.text(repr(obj))
+#             else:
+#                 p.begin_group(7, 'dtype([')
+#                 for i, field in enumerate(obj.descr):
+#                     if i > 0:
+#                         p.text(',')
+#                         p.breakable()
+#                     p.pretty(field)
+#                 p.end_group(7, '])')
+
+# PlainTextFormatter will inherit config from: BaseFormatter
+
+# 
+# c.PlainTextFormatter.max_width = 79
+
+# 
+# c.PlainTextFormatter.deferred_printers = {}
+
+# 
+# c.PlainTextFormatter.verbose = False
+
+# 
+# c.PlainTextFormatter.pprint = True
+
+# 
+# c.PlainTextFormatter.newline = '\n'
+
+# 
+# c.PlainTextFormatter.type_printers = {}
+
+# 
+# c.PlainTextFormatter.float_precision = ''
+
+# 
+# c.PlainTextFormatter.singleton_printers = {}
+
+#------------------------------------------------------------------------------
+# IPCompleter configuration
+#------------------------------------------------------------------------------
+
+# Extension of the completer class with IPython-specific features
+
+# IPCompleter will inherit config from: Completer
+
+# Instruct the completer to use __all__ for the completion
+# 
+# Specifically, when completing on ``object.<tab>``.
+# 
+# When True: only those names in obj.__all__ will be included.
+# 
+# When False [default]: the __all__ attribute is ignored
+# c.IPCompleter.limit_to__all__ = False
+
+# Activate greedy completion
+# 
+# This will enable completion on elements of lists, results of function calls,
+# etc., but can be unsafe because the code is actually evaluated on TAB.
+# c.IPCompleter.greedy = False
+
+# Whether to merge completion results into a single list
+# 
+# If False, only the completion results from the first non-empty completer will
+# be returned.
+# c.IPCompleter.merge_completions = True
+
+# Instruct the completer to omit private method names
+# 
+# Specifically, when completing on ``object.<tab>``.
+# 
+# When 2 [default]: all names that start with '_' will be excluded.
+# 
+# When 1: all 'magic' names (``__foo__``) will be excluded.
+# 
+# When 0: nothing will be excluded.
+# c.IPCompleter.omit__names = 2
+
+#------------------------------------------------------------------------------
+# ScriptMagics configuration
+#------------------------------------------------------------------------------
+
+# Magics for talking to scripts
+# 
+# This defines a base `%%script` cell magic for running a cell with a program in
+# a subprocess, and registers a few top-level magics that call %%script with
+# common interpreters.
+
+# Extra script cell magics to define
+# 
+# This generates simple wrappers of `%%script foo` as `%%foo`.
+# 
+# If you want to add script magics that aren't on your path, specify them in
+# script_paths
+# c.ScriptMagics.script_magics = []
+
+# Dict mapping short 'ruby' names to full paths, such as '/opt/secret/bin/ruby'
+# 
+# Only necessary for items in script_magics where the default path will not find
+# the right interpreter.
+# c.ScriptMagics.script_paths = {}
+
+#------------------------------------------------------------------------------
+# StoreMagics configuration
+#------------------------------------------------------------------------------
+
+# Lightweight persistence for python variables.
+# 
+# Provides the %store magic.
+
+# If True, any %store-d variables will be automatically restored when IPython
+# starts.
+# c.StoreMagics.autorestore = False
+
+c.KernelManager.kernel_cmd = ["java", "-jar",
+                              "/Users/jack/Docs/comp402/Java8/dynamicjava/dynamicjava.jar",
+                              "-kernel", "{connection_file}"]
+c.Session.key = b''
+c.Session.keyfile = b''
diff --git a/dynamicjava/profile/ipython_nbconvert_config.py b/dynamicjava/profile/ipython_nbconvert_config.py
new file mode 100644
index 000000000..2f7babbb6
--- /dev/null
+++ b/dynamicjava/profile/ipython_nbconvert_config.py
@@ -0,0 +1,844 @@
+# Configuration file for ipython-nbconvert.
+
+c = get_config()
+
+#------------------------------------------------------------------------------
+# NbConvertApp configuration
+#------------------------------------------------------------------------------
+
+# This application is used to convert notebook files (*.ipynb) to various other
+# formats.
+# 
+# WARNING: THE COMMANDLINE INTERFACE MAY CHANGE IN FUTURE RELEASES.
+
+# NbConvertApp will inherit config from: BaseIPythonApplication, Application
+
+# The Logging format template
+# c.NbConvertApp.log_format = '[%(name)s]%(highlevel)s %(message)s'
+
+# List of notebooks to convert. Wildcards are supported. Filenames passed
+# positionally will be added to the list.
+# c.NbConvertApp.notebooks = []
+
+# The name of the IPython directory. This directory is used for logging
+# configuration (through profiles), history storage, etc. The default is usually
+# $HOME/.ipython. This options can also be specified through the environment
+# variable IPYTHONDIR.
+# c.NbConvertApp.ipython_dir = ''
+
+# overwrite base name use for output files. can only  be use when converting one
+# notebook at a time.
+# c.NbConvertApp.output_base = ''
+
+# Whether to create profile dir if it doesn't exist
+# c.NbConvertApp.auto_create = False
+
+# Path to an extra config file to load.
+# 
+# If specified, load this config file in addition to any other IPython config.
+# c.NbConvertApp.extra_config_file = ''
+
+# Whether to install the default config files into the profile dir. If a new
+# profile is being created, and IPython contains config files for that profile,
+# then they will be staged into the new directory.  Otherwise, default config
+# files will be automatically generated.
+# c.NbConvertApp.copy_config_files = False
+
+# The date format used by logging formatters for %(asctime)s
+# c.NbConvertApp.log_datefmt = '%Y-%m-%d %H:%M:%S'
+
+# Set the log level by value or name.
+# c.NbConvertApp.log_level = 30
+
+# Writer class used to write the  results of the conversion
+# c.NbConvertApp.writer_class = 'FilesWriter'
+
+# The IPython profile to use.
+# c.NbConvertApp.profile = 'default'
+
+# Create a massive crash report when IPython encounters what may be an internal
+# error.  The default is to append a short message to the usual traceback
+# c.NbConvertApp.verbose_crash = False
+
+# PostProcessor class used to write the  results of the conversion
+# c.NbConvertApp.postprocessor_class = ''
+
+# The export format to be used.
+# c.NbConvertApp.export_format = 'html'
+
+# Whether to overwrite existing config files when copying
+# c.NbConvertApp.overwrite = False
+
+#------------------------------------------------------------------------------
+# NbConvertBase configuration
+#------------------------------------------------------------------------------
+
+# Global configurable class for shared config
+# 
+# Useful for display data priority that might be use by many transformers
+
+# An ordered list of preferred output type, the first encountered will usually
+# be used when converting discarding the others.
+# c.NbConvertBase.display_data_priority = ['html', 'application/pdf', 'svg', 'latex', 'png', 'jpg', 'jpeg', 'text']
+
+# default highlight language
+# c.NbConvertBase.default_language = 'ipython'
+
+#------------------------------------------------------------------------------
+# ProfileDir configuration
+#------------------------------------------------------------------------------
+
+# An object to manage the profile directory and its resources.
+# 
+# The profile directory is used by all IPython applications, to manage
+# configuration, logging and security.
+# 
+# This object knows how to find, create and manage these directories. This
+# should be used by any code that wants to handle profiles.
+
+# Set the profile location directly. This overrides the logic used by the
+# `profile` option.
+# c.ProfileDir.location = ''
+
+#------------------------------------------------------------------------------
+# Exporter configuration
+#------------------------------------------------------------------------------
+
+# Class containing methods that sequentially run a list of preprocessors on a
+# NotebookNode object and then return the modified NotebookNode object and
+# accompanying resources dict.
+
+# Extension of the file that should be written to disk
+# c.Exporter.file_extension = 'txt'
+
+# List of preprocessors, by name or namespace, to enable.
+# c.Exporter.preprocessors = []
+
+# List of preprocessors available by default, by name, namespace,  instance, or
+# type.
+# c.Exporter.default_preprocessors = ['IPython.nbconvert.preprocessors.coalesce_streams', 'IPython.nbconvert.preprocessors.SVG2PDFPreprocessor', 'IPython.nbconvert.preprocessors.ExtractOutputPreprocessor', 'IPython.nbconvert.preprocessors.CSSHTMLHeaderPreprocessor', 'IPython.nbconvert.preprocessors.RevealHelpPreprocessor', 'IPython.nbconvert.preprocessors.LatexPreprocessor', 'IPython.nbconvert.preprocessors.HighlightMagicsPreprocessor']
+
+#------------------------------------------------------------------------------
+# HTMLExporter configuration
+#------------------------------------------------------------------------------
+
+# Exports a basic HTML document.  This exporter assists with the export of HTML.
+# Inherit from it if you are writing your own HTML template and need custom
+# preprocessors/filters.  If you don't need custom preprocessors/ filters, just
+# change the 'template_file' config option.
+
+# HTMLExporter will inherit config from: TemplateExporter, Exporter
+
+# 
+# c.HTMLExporter.jinja_variable_block_end = ''
+
+# formats of raw cells to be included in this Exporter's output.
+# c.HTMLExporter.raw_mimetypes = []
+
+# List of preprocessors available by default, by name, namespace,  instance, or
+# type.
+# c.HTMLExporter.default_preprocessors = ['IPython.nbconvert.preprocessors.coalesce_streams', 'IPython.nbconvert.preprocessors.SVG2PDFPreprocessor', 'IPython.nbconvert.preprocessors.ExtractOutputPreprocessor', 'IPython.nbconvert.preprocessors.CSSHTMLHeaderPreprocessor', 'IPython.nbconvert.preprocessors.RevealHelpPreprocessor', 'IPython.nbconvert.preprocessors.LatexPreprocessor', 'IPython.nbconvert.preprocessors.HighlightMagicsPreprocessor']
+
+# 
+# c.HTMLExporter.jinja_comment_block_start = ''
+
+# Extension of the file that should be written to disk
+# c.HTMLExporter.file_extension = 'txt'
+
+# Dictionary of filters, by name and namespace, to add to the Jinja environment.
+# c.HTMLExporter.filters = {}
+
+# 
+# c.HTMLExporter.jinja_comment_block_end = ''
+
+# 
+# c.HTMLExporter.jinja_logic_block_end = ''
+
+# Name of the template file to use
+# c.HTMLExporter.template_file = 'default'
+
+# 
+# c.HTMLExporter.jinja_variable_block_start = ''
+
+# 
+# c.HTMLExporter.template_path = ['.']
+
+# 
+# c.HTMLExporter.jinja_logic_block_start = ''
+
+# List of preprocessors, by name or namespace, to enable.
+# c.HTMLExporter.preprocessors = []
+
+# 
+# c.HTMLExporter.template_extension = '.tpl'
+
+#------------------------------------------------------------------------------
+# LatexExporter configuration
+#------------------------------------------------------------------------------
+
+# Exports to a Latex template.  Inherit from this class if your template is
+# LaTeX based and you need custom tranformers/filters.  Inherit from it if  you
+# are writing your own HTML template and need custom tranformers/filters.   If
+# you don't need custom tranformers/filters, just change the  'template_file'
+# config option.  Place your template in the special "/latex"  subfolder of the
+# "../templates" folder.
+
+# LatexExporter will inherit config from: TemplateExporter, Exporter
+
+# 
+# c.LatexExporter.jinja_variable_block_end = ')))'
+
+# formats of raw cells to be included in this Exporter's output.
+# c.LatexExporter.raw_mimetypes = []
+
+# List of preprocessors available by default, by name, namespace,  instance, or
+# type.
+# c.LatexExporter.default_preprocessors = ['IPython.nbconvert.preprocessors.coalesce_streams', 'IPython.nbconvert.preprocessors.SVG2PDFPreprocessor', 'IPython.nbconvert.preprocessors.ExtractOutputPreprocessor', 'IPython.nbconvert.preprocessors.CSSHTMLHeaderPreprocessor', 'IPython.nbconvert.preprocessors.RevealHelpPreprocessor', 'IPython.nbconvert.preprocessors.LatexPreprocessor', 'IPython.nbconvert.preprocessors.HighlightMagicsPreprocessor']
+
+# 
+# c.LatexExporter.jinja_comment_block_start = '((='
+
+# Extension of the file that should be written to disk
+# c.LatexExporter.file_extension = 'txt'
+
+# Dictionary of filters, by name and namespace, to add to the Jinja environment.
+# c.LatexExporter.filters = {}
+
+# 
+# c.LatexExporter.jinja_comment_block_end = '=))'
+
+# 
+# c.LatexExporter.jinja_logic_block_end = '*))'
+
+# Name of the template file to use
+# c.LatexExporter.template_file = 'default'
+
+# 
+# c.LatexExporter.jinja_variable_block_start = '((('
+
+# 
+# c.LatexExporter.template_path = ['.']
+
+# 
+# c.LatexExporter.jinja_logic_block_start = '((*'
+
+# List of preprocessors, by name or namespace, to enable.
+# c.LatexExporter.preprocessors = []
+
+# 
+# c.LatexExporter.template_extension = '.tplx'
+
+#------------------------------------------------------------------------------
+# MarkdownExporter configuration
+#------------------------------------------------------------------------------
+
+# Exports to a markdown document (.md)
+
+# MarkdownExporter will inherit config from: TemplateExporter, Exporter
+
+# 
+# c.MarkdownExporter.jinja_variable_block_end = ''
+
+# formats of raw cells to be included in this Exporter's output.
+# c.MarkdownExporter.raw_mimetypes = []
+
+# List of preprocessors available by default, by name, namespace,  instance, or
+# type.
+# c.MarkdownExporter.default_preprocessors = ['IPython.nbconvert.preprocessors.coalesce_streams', 'IPython.nbconvert.preprocessors.SVG2PDFPreprocessor', 'IPython.nbconvert.preprocessors.ExtractOutputPreprocessor', 'IPython.nbconvert.preprocessors.CSSHTMLHeaderPreprocessor', 'IPython.nbconvert.preprocessors.RevealHelpPreprocessor', 'IPython.nbconvert.preprocessors.LatexPreprocessor', 'IPython.nbconvert.preprocessors.HighlightMagicsPreprocessor']
+
+# 
+# c.MarkdownExporter.jinja_comment_block_start = ''
+
+# Extension of the file that should be written to disk
+# c.MarkdownExporter.file_extension = 'txt'
+
+# Dictionary of filters, by name and namespace, to add to the Jinja environment.
+# c.MarkdownExporter.filters = {}
+
+# 
+# c.MarkdownExporter.jinja_comment_block_end = ''
+
+# 
+# c.MarkdownExporter.jinja_logic_block_end = ''
+
+# Name of the template file to use
+# c.MarkdownExporter.template_file = 'default'
+
+# 
+# c.MarkdownExporter.jinja_variable_block_start = ''
+
+# 
+# c.MarkdownExporter.template_path = ['.']
+
+# 
+# c.MarkdownExporter.jinja_logic_block_start = ''
+
+# List of preprocessors, by name or namespace, to enable.
+# c.MarkdownExporter.preprocessors = []
+
+# 
+# c.MarkdownExporter.template_extension = '.tpl'
+
+#------------------------------------------------------------------------------
+# PythonExporter configuration
+#------------------------------------------------------------------------------
+
+# Exports a Python code file.
+
+# PythonExporter will inherit config from: TemplateExporter, Exporter
+
+# 
+# c.PythonExporter.jinja_variable_block_end = ''
+
+# formats of raw cells to be included in this Exporter's output.
+# c.PythonExporter.raw_mimetypes = []
+
+# List of preprocessors available by default, by name, namespace,  instance, or
+# type.
+# c.PythonExporter.default_preprocessors = ['IPython.nbconvert.preprocessors.coalesce_streams', 'IPython.nbconvert.preprocessors.SVG2PDFPreprocessor', 'IPython.nbconvert.preprocessors.ExtractOutputPreprocessor', 'IPython.nbconvert.preprocessors.CSSHTMLHeaderPreprocessor', 'IPython.nbconvert.preprocessors.RevealHelpPreprocessor', 'IPython.nbconvert.preprocessors.LatexPreprocessor', 'IPython.nbconvert.preprocessors.HighlightMagicsPreprocessor']
+
+# 
+# c.PythonExporter.jinja_comment_block_start = ''
+
+# Extension of the file that should be written to disk
+# c.PythonExporter.file_extension = 'txt'
+
+# Dictionary of filters, by name and namespace, to add to the Jinja environment.
+# c.PythonExporter.filters = {}
+
+# 
+# c.PythonExporter.jinja_comment_block_end = ''
+
+# 
+# c.PythonExporter.jinja_logic_block_end = ''
+
+# Name of the template file to use
+# c.PythonExporter.template_file = 'default'
+
+# 
+# c.PythonExporter.jinja_variable_block_start = ''
+
+# 
+# c.PythonExporter.template_path = ['.']
+
+# 
+# c.PythonExporter.jinja_logic_block_start = ''
+
+# List of preprocessors, by name or namespace, to enable.
+# c.PythonExporter.preprocessors = []
+
+# 
+# c.PythonExporter.template_extension = '.tpl'
+
+#------------------------------------------------------------------------------
+# RSTExporter configuration
+#------------------------------------------------------------------------------
+
+# Exports restructured text documents.
+
+# RSTExporter will inherit config from: TemplateExporter, Exporter
+
+# 
+# c.RSTExporter.jinja_variable_block_end = ''
+
+# formats of raw cells to be included in this Exporter's output.
+# c.RSTExporter.raw_mimetypes = []
+
+# List of preprocessors available by default, by name, namespace,  instance, or
+# type.
+# c.RSTExporter.default_preprocessors = ['IPython.nbconvert.preprocessors.coalesce_streams', 'IPython.nbconvert.preprocessors.SVG2PDFPreprocessor', 'IPython.nbconvert.preprocessors.ExtractOutputPreprocessor', 'IPython.nbconvert.preprocessors.CSSHTMLHeaderPreprocessor', 'IPython.nbconvert.preprocessors.RevealHelpPreprocessor', 'IPython.nbconvert.preprocessors.LatexPreprocessor', 'IPython.nbconvert.preprocessors.HighlightMagicsPreprocessor']
+
+# 
+# c.RSTExporter.jinja_comment_block_start = ''
+
+# Extension of the file that should be written to disk
+# c.RSTExporter.file_extension = 'txt'
+
+# Dictionary of filters, by name and namespace, to add to the Jinja environment.
+# c.RSTExporter.filters = {}
+
+# 
+# c.RSTExporter.jinja_comment_block_end = ''
+
+# 
+# c.RSTExporter.jinja_logic_block_end = ''
+
+# Name of the template file to use
+# c.RSTExporter.template_file = 'default'
+
+# 
+# c.RSTExporter.jinja_variable_block_start = ''
+
+# 
+# c.RSTExporter.template_path = ['.']
+
+# 
+# c.RSTExporter.jinja_logic_block_start = ''
+
+# List of preprocessors, by name or namespace, to enable.
+# c.RSTExporter.preprocessors = []
+
+# 
+# c.RSTExporter.template_extension = '.tpl'
+
+#------------------------------------------------------------------------------
+# SlidesExporter configuration
+#------------------------------------------------------------------------------
+
+# Exports HTML slides with reveal.js
+
+# SlidesExporter will inherit config from: HTMLExporter, TemplateExporter,
+# Exporter
+
+# 
+# c.SlidesExporter.jinja_variable_block_end = ''
+
+# formats of raw cells to be included in this Exporter's output.
+# c.SlidesExporter.raw_mimetypes = []
+
+# List of preprocessors available by default, by name, namespace,  instance, or
+# type.
+# c.SlidesExporter.default_preprocessors = ['IPython.nbconvert.preprocessors.coalesce_streams', 'IPython.nbconvert.preprocessors.SVG2PDFPreprocessor', 'IPython.nbconvert.preprocessors.ExtractOutputPreprocessor', 'IPython.nbconvert.preprocessors.CSSHTMLHeaderPreprocessor', 'IPython.nbconvert.preprocessors.RevealHelpPreprocessor', 'IPython.nbconvert.preprocessors.LatexPreprocessor', 'IPython.nbconvert.preprocessors.HighlightMagicsPreprocessor']
+
+# 
+# c.SlidesExporter.jinja_comment_block_start = ''
+
+# Extension of the file that should be written to disk
+# c.SlidesExporter.file_extension = 'txt'
+
+# Dictionary of filters, by name and namespace, to add to the Jinja environment.
+# c.SlidesExporter.filters = {}
+
+# 
+# c.SlidesExporter.jinja_comment_block_end = ''
+
+# 
+# c.SlidesExporter.jinja_logic_block_end = ''
+
+# Name of the template file to use
+# c.SlidesExporter.template_file = 'default'
+
+# 
+# c.SlidesExporter.jinja_variable_block_start = ''
+
+# 
+# c.SlidesExporter.template_path = ['.']
+
+# 
+# c.SlidesExporter.jinja_logic_block_start = ''
+
+# List of preprocessors, by name or namespace, to enable.
+# c.SlidesExporter.preprocessors = []
+
+# 
+# c.SlidesExporter.template_extension = '.tpl'
+
+#------------------------------------------------------------------------------
+# TemplateExporter configuration
+#------------------------------------------------------------------------------
+
+# Exports notebooks into other file formats.  Uses Jinja 2 templating engine to
+# output new formats.  Inherit from this class if you are creating a new
+# template type along with new filters/preprocessors.  If the filters/
+# preprocessors provided by default suffice, there is no need to inherit from
+# this class.  Instead, override the template_file and file_extension traits via
+# a config file.
+# 
+# - posix_path - filter_data_type - strip_dollars - markdown2rst - ansi2latex -
+# markdown2html - html2text - escape_latex - ipython2python - strip_files_prefix
+# - comment_lines - markdown2latex - highlight2latex - add_prompts -
+# highlight2html - add_anchor - path2url - ansi2html - get_lines - strip_ansi -
+# citation2latex - indent - ascii_only - wrap_text
+
+# TemplateExporter will inherit config from: Exporter
+
+# 
+# c.TemplateExporter.jinja_variable_block_end = ''
+
+# formats of raw cells to be included in this Exporter's output.
+# c.TemplateExporter.raw_mimetypes = []
+
+# List of preprocessors available by default, by name, namespace,  instance, or
+# type.
+# c.TemplateExporter.default_preprocessors = ['IPython.nbconvert.preprocessors.coalesce_streams', 'IPython.nbconvert.preprocessors.SVG2PDFPreprocessor', 'IPython.nbconvert.preprocessors.ExtractOutputPreprocessor', 'IPython.nbconvert.preprocessors.CSSHTMLHeaderPreprocessor', 'IPython.nbconvert.preprocessors.RevealHelpPreprocessor', 'IPython.nbconvert.preprocessors.LatexPreprocessor', 'IPython.nbconvert.preprocessors.HighlightMagicsPreprocessor']
+
+# 
+# c.TemplateExporter.jinja_comment_block_start = ''
+
+# Extension of the file that should be written to disk
+# c.TemplateExporter.file_extension = 'txt'
+
+# Dictionary of filters, by name and namespace, to add to the Jinja environment.
+# c.TemplateExporter.filters = {}
+
+# 
+# c.TemplateExporter.jinja_comment_block_end = ''
+
+# 
+# c.TemplateExporter.jinja_logic_block_end = ''
+
+# Name of the template file to use
+# c.TemplateExporter.template_file = 'default'
+
+# 
+# c.TemplateExporter.jinja_variable_block_start = ''
+
+# 
+# c.TemplateExporter.template_path = ['.']
+
+# 
+# c.TemplateExporter.jinja_logic_block_start = ''
+
+# List of preprocessors, by name or namespace, to enable.
+# c.TemplateExporter.preprocessors = []
+
+# 
+# c.TemplateExporter.template_extension = '.tpl'
+
+#------------------------------------------------------------------------------
+# CSSHTMLHeaderPreprocessor configuration
+#------------------------------------------------------------------------------
+
+# Preprocessor used to pre-process notebook for HTML output.  Adds IPython
+# notebook front-end CSS and Pygments CSS to HTML output.
+
+# CSSHTMLHeaderPreprocessor will inherit config from: Preprocessor,
+# NbConvertBase
+
+# 
+# c.CSSHTMLHeaderPreprocessor.enabled = False
+
+# CSS highlight class identifier
+# c.CSSHTMLHeaderPreprocessor.highlight_class = '.highlight'
+
+# An ordered list of preferred output type, the first encountered will usually
+# be used when converting discarding the others.
+# c.CSSHTMLHeaderPreprocessor.display_data_priority = ['html', 'application/pdf', 'svg', 'latex', 'png', 'jpg', 'jpeg', 'text']
+
+# default highlight language
+# c.CSSHTMLHeaderPreprocessor.default_language = 'ipython'
+
+#------------------------------------------------------------------------------
+# ConvertFiguresPreprocessor configuration
+#------------------------------------------------------------------------------
+
+# Converts all of the outputs in a notebook from one format to another.
+
+# ConvertFiguresPreprocessor will inherit config from: Preprocessor,
+# NbConvertBase
+
+# Format the converter accepts
+# c.ConvertFiguresPreprocessor.from_format = ''
+
+# Format the converter writes
+# c.ConvertFiguresPreprocessor.to_format = ''
+
+# 
+# c.ConvertFiguresPreprocessor.enabled = False
+
+# An ordered list of preferred output type, the first encountered will usually
+# be used when converting discarding the others.
+# c.ConvertFiguresPreprocessor.display_data_priority = ['html', 'application/pdf', 'svg', 'latex', 'png', 'jpg', 'jpeg', 'text']
+
+# default highlight language
+# c.ConvertFiguresPreprocessor.default_language = 'ipython'
+
+#------------------------------------------------------------------------------
+# ExtractOutputPreprocessor configuration
+#------------------------------------------------------------------------------
+
+# Extracts all of the outputs from the notebook file.  The extracted  outputs
+# are returned in the 'resources' dictionary.
+
+# ExtractOutputPreprocessor will inherit config from: Preprocessor,
+# NbConvertBase
+
+# 
+# c.ExtractOutputPreprocessor.output_filename_template = '{unique_key}_{cell_index}_{index}{extension}'
+
+# 
+# c.ExtractOutputPreprocessor.enabled = False
+
+# default highlight language
+# c.ExtractOutputPreprocessor.default_language = 'ipython'
+
+# An ordered list of preferred output type, the first encountered will usually
+# be used when converting discarding the others.
+# c.ExtractOutputPreprocessor.display_data_priority = ['html', 'application/pdf', 'svg', 'latex', 'png', 'jpg', 'jpeg', 'text']
+
+# 
+# c.ExtractOutputPreprocessor.extract_output_types = {'jpeg', 'png', 'application/pdf', 'svg'}
+
+#------------------------------------------------------------------------------
+# HighlightMagicsPreprocessor configuration
+#------------------------------------------------------------------------------
+
+# Detects and tags code cells that use a different languages than Python.
+
+# HighlightMagicsPreprocessor will inherit config from: Preprocessor,
+# NbConvertBase
+
+# 
+# c.HighlightMagicsPreprocessor.enabled = False
+
+# Syntax highlighting for magic's extension languages. Each item associates a
+# language magic extension such as %%R, with a pygments lexer such as r.
+# c.HighlightMagicsPreprocessor.languages = {}
+
+# An ordered list of preferred output type, the first encountered will usually
+# be used when converting discarding the others.
+# c.HighlightMagicsPreprocessor.display_data_priority = ['html', 'application/pdf', 'svg', 'latex', 'png', 'jpg', 'jpeg', 'text']
+
+# default highlight language
+# c.HighlightMagicsPreprocessor.default_language = 'ipython'
+
+#------------------------------------------------------------------------------
+# LatexPreprocessor configuration
+#------------------------------------------------------------------------------
+
+# Preprocessor for latex destined documents.
+# 
+# Mainly populates the `latex` key in the resources dict, adding definitions for
+# pygments highlight styles.
+
+# LatexPreprocessor will inherit config from: Preprocessor, NbConvertBase
+
+# 
+# c.LatexPreprocessor.enabled = False
+
+# An ordered list of preferred output type, the first encountered will usually
+# be used when converting discarding the others.
+# c.LatexPreprocessor.display_data_priority = ['html', 'application/pdf', 'svg', 'latex', 'png', 'jpg', 'jpeg', 'text']
+
+# default highlight language
+# c.LatexPreprocessor.default_language = 'ipython'
+
+#------------------------------------------------------------------------------
+# Preprocessor configuration
+#------------------------------------------------------------------------------
+
+# A configurable preprocessor
+# 
+# Inherit from this class if you wish to have configurability for your
+# preprocessor.
+# 
+# Any configurable traitlets this class exposed will be configurable in profiles
+# using c.SubClassName.attribute = value
+# 
+# you can overwrite :meth:`preprocess_cell` to apply a transformation
+# independently on each cell or :meth:`preprocess` if you prefer your own logic.
+# See corresponding docstring for informations.
+# 
+# Disabled by default and can be enabled via the config by
+#     'c.YourPreprocessorName.enabled = True'
+
+# Preprocessor will inherit config from: NbConvertBase
+
+# 
+# c.Preprocessor.enabled = False
+
+# An ordered list of preferred output type, the first encountered will usually
+# be used when converting discarding the others.
+# c.Preprocessor.display_data_priority = ['html', 'application/pdf', 'svg', 'latex', 'png', 'jpg', 'jpeg', 'text']
+
+# default highlight language
+# c.Preprocessor.default_language = 'ipython'
+
+#------------------------------------------------------------------------------
+# RevealHelpPreprocessor configuration
+#------------------------------------------------------------------------------
+
+# RevealHelpPreprocessor will inherit config from: Preprocessor, NbConvertBase
+
+# The URL prefix for reveal.js. This can be a a relative URL for a local copy of
+# reveal.js, or point to a CDN.
+# 
+# For speaker notes to work, a local reveal.js prefix must be used.
+# c.RevealHelpPreprocessor.url_prefix = 'reveal.js'
+
+# 
+# c.RevealHelpPreprocessor.enabled = False
+
+# An ordered list of preferred output type, the first encountered will usually
+# be used when converting discarding the others.
+# c.RevealHelpPreprocessor.display_data_priority = ['html', 'application/pdf', 'svg', 'latex', 'png', 'jpg', 'jpeg', 'text']
+
+# default highlight language
+# c.RevealHelpPreprocessor.default_language = 'ipython'
+
+#------------------------------------------------------------------------------
+# SVG2PDFPreprocessor configuration
+#------------------------------------------------------------------------------
+
+# Converts all of the outputs in a notebook from SVG to PDF.
+
+# SVG2PDFPreprocessor will inherit config from: ConvertFiguresPreprocessor,
+# Preprocessor, NbConvertBase
+
+# 
+# c.SVG2PDFPreprocessor.enabled = False
+
+# The command to use for converting SVG to PDF
+# 
+# This string is a template, which will be formatted with the keys to_filename
+# and from_filename.
+# 
+# The conversion call must read the SVG from {from_flename}, and write a PDF to
+# {to_filename}.
+# c.SVG2PDFPreprocessor.command = ''
+
+# The path to Inkscape, if necessary
+# c.SVG2PDFPreprocessor.inkscape = ''
+
+# Format the converter accepts
+# c.SVG2PDFPreprocessor.from_format = ''
+
+# Format the converter writes
+# c.SVG2PDFPreprocessor.to_format = ''
+
+# An ordered list of preferred output type, the first encountered will usually
+# be used when converting discarding the others.
+# c.SVG2PDFPreprocessor.display_data_priority = ['html', 'application/pdf', 'svg', 'latex', 'png', 'jpg', 'jpeg', 'text']
+
+# default highlight language
+# c.SVG2PDFPreprocessor.default_language = 'ipython'
+
+#------------------------------------------------------------------------------
+# FilesWriter configuration
+#------------------------------------------------------------------------------
+
+# Consumes nbconvert output and produces files.
+
+# FilesWriter will inherit config from: WriterBase, NbConvertBase
+
+# Directory to write output to.  Leave blank to output to the current directory
+# c.FilesWriter.build_directory = ''
+
+# List of the files that the notebook references.  Files will be  included with
+# written output.
+# c.FilesWriter.files = []
+
+# An ordered list of preferred output type, the first encountered will usually
+# be used when converting discarding the others.
+# c.FilesWriter.display_data_priority = ['html', 'application/pdf', 'svg', 'latex', 'png', 'jpg', 'jpeg', 'text']
+
+# default highlight language
+# c.FilesWriter.default_language = 'ipython'
+
+#------------------------------------------------------------------------------
+# StdoutWriter configuration
+#------------------------------------------------------------------------------
+
+# Consumes output from nbconvert export...() methods and writes to the  stdout
+# stream.
+
+# StdoutWriter will inherit config from: WriterBase, NbConvertBase
+
+# List of the files that the notebook references.  Files will be  included with
+# written output.
+# c.StdoutWriter.files = []
+
+# An ordered list of preferred output type, the first encountered will usually
+# be used when converting discarding the others.
+# c.StdoutWriter.display_data_priority = ['html', 'application/pdf', 'svg', 'latex', 'png', 'jpg', 'jpeg', 'text']
+
+# default highlight language
+# c.StdoutWriter.default_language = 'ipython'
+
+#------------------------------------------------------------------------------
+# WriterBase configuration
+#------------------------------------------------------------------------------
+
+# Consumes output from nbconvert export...() methods and writes to a useful
+# location.
+
+# WriterBase will inherit config from: NbConvertBase
+
+# List of the files that the notebook references.  Files will be  included with
+# written output.
+# c.WriterBase.files = []
+
+# An ordered list of preferred output type, the first encountered will usually
+# be used when converting discarding the others.
+# c.WriterBase.display_data_priority = ['html', 'application/pdf', 'svg', 'latex', 'png', 'jpg', 'jpeg', 'text']
+
+# default highlight language
+# c.WriterBase.default_language = 'ipython'
+
+#------------------------------------------------------------------------------
+# PDFPostProcessor configuration
+#------------------------------------------------------------------------------
+
+# Writer designed to write to PDF files
+
+# PDFPostProcessor will inherit config from: PostProcessorBase, NbConvertBase
+
+# Shell command used to compile PDF.
+# c.PDFPostProcessor.latex_command = ['pdflatex', '{filename}']
+
+# Whether or not to display the output of the compile call.
+# c.PDFPostProcessor.verbose = False
+
+# Whether or not to open the pdf after the compile call.
+# c.PDFPostProcessor.pdf_open = False
+
+# Filename extensions of temp files to remove after running.
+# c.PDFPostProcessor.temp_file_exts = ['.aux', '.bbl', '.blg', '.idx', '.log', '.out']
+
+# default highlight language
+# c.PDFPostProcessor.default_language = 'ipython'
+
+# How many times pdflatex will be called.
+# c.PDFPostProcessor.latex_count = 3
+
+# An ordered list of preferred output type, the first encountered will usually
+# be used when converting discarding the others.
+# c.PDFPostProcessor.display_data_priority = ['html', 'application/pdf', 'svg', 'latex', 'png', 'jpg', 'jpeg', 'text']
+
+# Shell command used to run bibtex.
+# c.PDFPostProcessor.bib_command = ['bibtex', '{filename}']
+
+#------------------------------------------------------------------------------
+# PostProcessorBase configuration
+#------------------------------------------------------------------------------
+
+# PostProcessorBase will inherit config from: NbConvertBase
+
+# An ordered list of preferred output type, the first encountered will usually
+# be used when converting discarding the others.
+# c.PostProcessorBase.display_data_priority = ['html', 'application/pdf', 'svg', 'latex', 'png', 'jpg', 'jpeg', 'text']
+
+# default highlight language
+# c.PostProcessorBase.default_language = 'ipython'
+
+#------------------------------------------------------------------------------
+# ServePostProcessor configuration
+#------------------------------------------------------------------------------
+
+# Post processor designed to serve files
+# 
+# Proxies reveal.js requests to a CDN if no local reveal.js is present
+
+# ServePostProcessor will inherit config from: PostProcessorBase, NbConvertBase
+
+# port for the server to listen on.
+# c.ServePostProcessor.port = 8000
+
+# URL prefix for reveal.js
+# c.ServePostProcessor.reveal_prefix = 'reveal.js'
+
+# URL for reveal.js CDN.
+# c.ServePostProcessor.reveal_cdn = 'https://cdn.jsdelivr.net/reveal.js/2.5.0'
+
+# Should the browser be opened automatically?
+# c.ServePostProcessor.open_in_browser = True
+
+# The IP address to listen on.
+# c.ServePostProcessor.ip = '127.0.0.1'
+
+# An ordered list of preferred output type, the first encountered will usually
+# be used when converting discarding the others.
+# c.ServePostProcessor.display_data_priority = ['html', 'application/pdf', 'svg', 'latex', 'png', 'jpg', 'jpeg', 'text']
+
+# default highlight language
+# c.ServePostProcessor.default_language = 'ipython'
diff --git a/dynamicjava/profile/ipython_notebook_config.py b/dynamicjava/profile/ipython_notebook_config.py
new file mode 100644
index 000000000..c362da4bb
--- /dev/null
+++ b/dynamicjava/profile/ipython_notebook_config.py
@@ -0,0 +1,662 @@
+# Configuration file for ipython-notebook.
+
+c = get_config()
+
+#------------------------------------------------------------------------------
+# NotebookApp configuration
+#------------------------------------------------------------------------------
+
+# NotebookApp will inherit config from: BaseIPythonApplication, Application
+
+# The full path to a private key file for usage with SSL/TLS.
+# c.NotebookApp.keyfile = ''
+
+# Extra paths to search for serving static files.
+# 
+# This allows adding javascript/css to be available from the notebook server
+# machine, or overriding individual files in the IPython
+# c.NotebookApp.extra_static_paths = []
+
+# The name of the IPython directory. This directory is used for logging
+# configuration (through profiles), history storage, etc. The default is usually
+# $HOME/.ipython. This options can also be specified through the environment
+# variable IPYTHONDIR.
+# c.NotebookApp.ipython_dir = ''
+
+# The directory to use for notebooks and kernels.
+# c.NotebookApp.notebook_dir = '/Users/jack/Docs/comp402/Java8/dynamicjava'
+
+# The notebook manager class to use.
+# c.NotebookApp.notebook_manager_class = 'IPython.html.services.notebooks.filenbmanager.FileNotebookManager'
+
+# The random bytes used to secure cookies. By default this is a new random
+# number every time you start the Notebook. Set it to a value in a config file
+# to enable logins to persist across server sessions.
+# 
+# Note: Cookie secrets should be kept private, do not share config files with
+# cookie_secret stored in plaintext (you can read the value from a file).
+# c.NotebookApp.cookie_secret = b''
+
+# Whether to install the default config files into the profile dir. If a new
+# profile is being created, and IPython contains config files for that profile,
+# then they will be staged into the new directory.  Otherwise, default config
+# files will be automatically generated.
+# c.NotebookApp.copy_config_files = False
+
+# DEPRECATED use base_url
+# c.NotebookApp.base_project_url = '/'
+
+# Supply extra arguments that will be passed to Jinja environment.
+# c.NotebookApp.jinja_environment_options = {}
+
+# Create a massive crash report when IPython encounters what may be an internal
+# error.  The default is to append a short message to the usual traceback
+# c.NotebookApp.verbose_crash = False
+
+# The full path to an SSL/TLS certificate file.
+# c.NotebookApp.certfile = ''
+
+# The date format used by logging formatters for %(asctime)s
+# c.NotebookApp.log_datefmt = '%Y-%m-%d %H:%M:%S'
+
+# 
+# c.NotebookApp.file_to_run = ''
+
+# The port the notebook server will listen on.
+# c.NotebookApp.port = 8888
+
+# Set the Access-Control-Allow-Origin header
+# 
+# Use '*' to allow any origin to access your server.
+# 
+# Takes precedence over allow_origin_pat.
+# c.NotebookApp.allow_origin = ''
+
+# The Logging format template
+# c.NotebookApp.log_format = '[%(name)s]%(highlevel)s %(message)s'
+
+# Specify what command to use to invoke a web browser when opening the notebook.
+# If not specified, the default browser will be determined by the `webbrowser`
+# standard library module, which allows setting of the BROWSER environment
+# variable to override it.
+# c.NotebookApp.browser = ''
+
+# The base URL for the notebook server.
+# 
+# Leading and trailing slashes can be omitted, and will automatically be added.
+# c.NotebookApp.base_url = '/'
+
+# Whether to enable MathJax for typesetting math/TeX
+# 
+# MathJax is the javascript library IPython uses to render math/LaTeX. It is
+# very large, so you may want to disable it if you have a slow internet
+# connection, or for offline use of the notebook.
+# 
+# When disabled, equations etc. will appear as their untransformed TeX source.
+# c.NotebookApp.enable_mathjax = True
+
+# paths for Javascript extensions. By default, this is just
+# IPYTHONDIR/nbextensions
+# c.NotebookApp.nbextensions_path = []
+
+# Hashed password to use for web authentication.
+# 
+# To generate, type in a python/IPython shell:
+# 
+#   from IPython.lib import passwd; passwd()
+# 
+# The string should be of the form type:salt:hashed-password.
+# c.NotebookApp.password = ''
+
+# Supply overrides for the tornado.web.Application that the IPython notebook
+# uses.
+# c.NotebookApp.webapp_settings = {}
+
+# Path to an extra config file to load.
+# 
+# If specified, load this config file in addition to any other IPython config.
+# c.NotebookApp.extra_config_file = ''
+
+# Use a regular expression for the Access-Control-Allow-Origin header
+# 
+# Requests from an origin matching the expression will get replies with:
+# 
+#     Access-Control-Allow-Origin: origin
+# 
+# where `origin` is the origin of the request.
+# 
+# Ignored if allow_origin is set.
+# c.NotebookApp.allow_origin_pat = ''
+
+# Set the Access-Control-Allow-Credentials: true header
+# c.NotebookApp.allow_credentials = False
+
+# The url for MathJax.js.
+# c.NotebookApp.mathjax_url = ''
+
+# The IPython profile to use.
+# c.NotebookApp.profile = 'default'
+
+# Set the log level by value or name.
+# c.NotebookApp.log_level = 30
+
+# The number of additional ports to try if the specified port is not available.
+# c.NotebookApp.port_retries = 50
+
+# Whether to open in a browser after starting. The specific browser used is
+# platform dependent and determined by the python standard library `webbrowser`
+# module, unless it is overridden using the --browser (NotebookApp.browser)
+# configuration option.
+# c.NotebookApp.open_browser = True
+
+# Whether to trust or not X-Scheme/X-Forwarded-Proto and X-Real-Ip/X-Forwarded-
+# For headerssent by the upstream reverse proxy. Necessary if the proxy handles
+# SSL
+# c.NotebookApp.trust_xheaders = False
+
+# Whether to overwrite existing config files when copying
+# c.NotebookApp.overwrite = False
+
+# The IP address the notebook server will listen on.
+# c.NotebookApp.ip = 'localhost'
+
+#------------------------------------------------------------------------------
+# IPKernelApp configuration
+#------------------------------------------------------------------------------
+
+# IPython: an enhanced interactive Python shell.
+
+# IPKernelApp will inherit config from: BaseIPythonApplication, Application,
+# InteractiveShellApp
+
+# Path to an extra config file to load.
+# 
+# If specified, load this config file in addition to any other IPython config.
+# c.IPKernelApp.extra_config_file = ''
+
+# lines of code to run at IPython startup.
+# c.IPKernelApp.exec_lines = []
+
+# kill this process if its parent dies.  On Windows, the argument specifies the
+# HANDLE of the parent process, otherwise it is simply boolean.
+# c.IPKernelApp.parent_handle = 0
+
+# Should variables loaded at startup (by startup files, exec_lines, etc.) be
+# hidden from tools like %who?
+# c.IPKernelApp.hide_initial_ns = True
+
+# Execute the given command string.
+# c.IPKernelApp.code_to_run = ''
+
+# If true, IPython will populate the user namespace with numpy, pylab, etc. and
+# an ``import *`` is done from numpy and pylab, when using pylab mode.
+# 
+# When False, pylab mode should not import any names into the user namespace.
+# c.IPKernelApp.pylab_import_all = True
+
+# The importstring for the DisplayHook factory
+# c.IPKernelApp.displayhook_class = 'IPython.kernel.zmq.displayhook.ZMQDisplayHook'
+
+# JSON file in which to store connection info [default: kernel-<pid>.json]
+# 
+# This file will contain the IP, ports, and authentication key needed to connect
+# clients to this kernel. By default, this file will be created in the security
+# dir of the current profile, but can be specified by absolute path.
+# c.IPKernelApp.connection_file = ''
+
+# A list of dotted module names of IPython extensions to load.
+# c.IPKernelApp.extensions = []
+
+# ONLY USED ON WINDOWS Interrupt this process when the parent is signaled.
+# c.IPKernelApp.interrupt = 0
+
+# Whether to create profile dir if it doesn't exist
+# c.IPKernelApp.auto_create = False
+
+# Whether to install the default config files into the profile dir. If a new
+# profile is being created, and IPython contains config files for that profile,
+# then they will be staged into the new directory.  Otherwise, default config
+# files will be automatically generated.
+# c.IPKernelApp.copy_config_files = False
+
+# Run the module as a script.
+# c.IPKernelApp.module_to_run = ''
+
+# Enable GUI event loop integration with any of ('glut', 'gtk', 'gtk3', 'none',
+# 'osx', 'pyglet', 'qt', 'qt4', 'tk', 'wx').
+# c.IPKernelApp.gui = None
+
+# Pre-load matplotlib and numpy for interactive use, selecting a particular
+# matplotlib backend and loop integration.
+# c.IPKernelApp.pylab = None
+
+# redirect stdout to the null device
+# c.IPKernelApp.no_stdout = False
+
+# redirect stderr to the null device
+# c.IPKernelApp.no_stderr = False
+
+# A file to be run
+# c.IPKernelApp.file_to_run = ''
+
+# Create a massive crash report when IPython encounters what may be an internal
+# error.  The default is to append a short message to the usual traceback
+# c.IPKernelApp.verbose_crash = False
+
+# The Logging format template
+# c.IPKernelApp.log_format = '[%(name)s]%(highlevel)s %(message)s'
+
+# set the iopub (PUB) port [default: random]
+# c.IPKernelApp.iopub_port = 0
+
+# dotted module name of an IPython extension to load.
+# c.IPKernelApp.extra_extension = ''
+
+# set the heartbeat port [default: random]
+# c.IPKernelApp.hb_port = 0
+
+# set the control (ROUTER) port [default: random]
+# c.IPKernelApp.control_port = 0
+
+# 
+# c.IPKernelApp.transport = 'tcp'
+
+# The date format used by logging formatters for %(asctime)s
+# c.IPKernelApp.log_datefmt = '%Y-%m-%d %H:%M:%S'
+
+# List of files to run at IPython startup.
+# c.IPKernelApp.exec_files = []
+
+# set the stdin (ROUTER) port [default: random]
+# c.IPKernelApp.stdin_port = 0
+
+# 
+# c.IPKernelApp.parent_appname = ''
+
+# The IPython profile to use.
+# c.IPKernelApp.profile = 'default'
+
+# The importstring for the OutStream factory
+# c.IPKernelApp.outstream_class = 'IPython.kernel.zmq.iostream.OutStream'
+
+# The name of the IPython directory. This directory is used for logging
+# configuration (through profiles), history storage, etc. The default is usually
+# $HOME/.ipython. This options can also be specified through the environment
+# variable IPYTHONDIR.
+# c.IPKernelApp.ipython_dir = ''
+
+# Run the file referenced by the PYTHONSTARTUP environment variable at IPython
+# startup.
+# c.IPKernelApp.exec_PYTHONSTARTUP = True
+
+# Configure matplotlib for interactive use with the default matplotlib backend.
+# c.IPKernelApp.matplotlib = None
+
+# Set the log level by value or name.
+# c.IPKernelApp.log_level = 30
+
+# set the shell (ROUTER) port [default: random]
+# c.IPKernelApp.shell_port = 0
+
+# The Kernel subclass to be used.
+# 
+# This should allow easy re-use of the IPKernelApp entry point to configure and
+# launch kernels other than IPython's own.
+# c.IPKernelApp.kernel_class = 'IPython.kernel.zmq.ipkernel.Kernel'
+
+# Whether to overwrite existing config files when copying
+# c.IPKernelApp.overwrite = False
+
+# Set the IP or interface on which the kernel will listen.
+# c.IPKernelApp.ip = ''
+
+#------------------------------------------------------------------------------
+# ZMQInteractiveShell configuration
+#------------------------------------------------------------------------------
+
+# A subclass of InteractiveShell for ZMQ.
+
+# ZMQInteractiveShell will inherit config from: InteractiveShell
+
+# Show rewritten input, e.g. for autocall.
+# c.ZMQInteractiveShell.show_rewritten_input = True
+
+# 
+# c.ZMQInteractiveShell.readline_parse_and_bind = ['tab: complete', '"\\C-l": clear-screen', 'set show-all-if-ambiguous on', '"\\C-o": tab-insert', '"\\C-r": reverse-search-history', '"\\C-s": forward-search-history', '"\\C-p": history-search-backward', '"\\C-n": history-search-forward', '"\\e[A": history-search-backward', '"\\e[B": history-search-forward', '"\\C-k": kill-line', '"\\C-u": unix-line-discard']
+
+# Deprecated, use PromptManager.in_template
+# c.ZMQInteractiveShell.prompt_in1 = 'In [\\#]: '
+
+# 
+# c.ZMQInteractiveShell.ipython_dir = ''
+
+# 
+# c.ZMQInteractiveShell.history_length = 10000
+
+# Deprecated, use PromptManager.justify
+# c.ZMQInteractiveShell.prompts_pad_left = True
+
+# 
+# c.ZMQInteractiveShell.object_info_string_level = 0
+
+# 
+# c.ZMQInteractiveShell.separate_out2 = ''
+
+# 
+# c.ZMQInteractiveShell.debug = False
+
+# 
+# c.ZMQInteractiveShell.separate_in = '\n'
+
+# 
+# c.ZMQInteractiveShell.quiet = False
+
+# Automatically call the pdb debugger after every exception.
+# c.ZMQInteractiveShell.pdb = False
+
+# The name of the logfile to use.
+# c.ZMQInteractiveShell.logfile = ''
+
+# Set the color scheme (NoColor, Linux, or LightBG).
+# c.ZMQInteractiveShell.colors = 'LightBG'
+
+# 
+# c.ZMQInteractiveShell.wildcards_case_sensitive = True
+
+# Don't call post-execute functions that have failed in the past.
+# c.ZMQInteractiveShell.disable_failing_post_execute = False
+
+# Deprecated, use PromptManager.in2_template
+# c.ZMQInteractiveShell.prompt_in2 = '   .\\D.: '
+
+# Enable magic commands to be called without the leading %.
+# c.ZMQInteractiveShell.automagic = True
+
+# 
+# c.ZMQInteractiveShell.xmode = 'Context'
+
+# Make IPython automatically call any callable object even if you didn't type
+# explicit parentheses. For example, 'str 43' becomes 'str(43)' automatically.
+# The value can be '0' to disable the feature, '1' for 'smart' autocall, where
+# it is not applied if there are no more arguments on the line, and '2' for
+# 'full' autocall, where all callable objects are automatically called (even if
+# no arguments are present).
+# c.ZMQInteractiveShell.autocall = 0
+
+# Start logging to the default log file.
+# c.ZMQInteractiveShell.logstart = False
+
+# Use colors for displaying information about objects. Because this information
+# is passed through a pager (like 'less'), and some pagers get confused with
+# color codes, this capability can be turned off.
+# c.ZMQInteractiveShell.color_info = True
+
+# A list of ast.NodeTransformer subclass instances, which will be applied to
+# user input before code is run.
+# c.ZMQInteractiveShell.ast_transformers = []
+
+# Deprecated, use PromptManager.out_template
+# c.ZMQInteractiveShell.prompt_out = 'Out[\\#]: '
+
+# 
+# c.ZMQInteractiveShell.separate_out = ''
+
+# Start logging to the given file in append mode.
+# c.ZMQInteractiveShell.logappend = ''
+
+# Set the size of the output cache.  The default is 1000, you can change it
+# permanently in your config file.  Setting it to 0 completely disables the
+# caching system, and the minimum value accepted is 20 (if you provide a value
+# less than 20, it is reset to 0 and a warning is issued).  This limit is
+# defined because otherwise you'll spend more time re-flushing a too small cache
+# than working
+# c.ZMQInteractiveShell.cache_size = 1000
+
+# Enable deep (recursive) reloading by default. IPython can use the deep_reload
+# module which reloads changes in modules recursively (it replaces the reload()
+# function, so you don't need to change anything to use it). deep_reload()
+# forces a full reload of modules whose code may have changed, which the default
+# reload() function does not.  When deep_reload is off, IPython will use the
+# normal reload(), but deep_reload will still be available as dreload().
+# c.ZMQInteractiveShell.deep_reload = False
+
+# 
+# c.ZMQInteractiveShell.readline_remove_delims = '-/~'
+
+# Save multi-line entries as one entry in readline history
+# c.ZMQInteractiveShell.multiline_history = True
+
+# 'all', 'last', 'last_expr' or 'none', specifying which nodes should be run
+# interactively (displaying output from expressions).
+# c.ZMQInteractiveShell.ast_node_interactivity = 'last_expr'
+
+#------------------------------------------------------------------------------
+# KernelManager configuration
+#------------------------------------------------------------------------------
+
+# Manages a single kernel in a subprocess on this host.
+# 
+# This version starts kernels with Popen.
+
+# KernelManager will inherit config from: ConnectionFileMixin
+
+# Should we autorestart the kernel if it dies.
+# c.KernelManager.autorestart = False
+
+# 
+# c.KernelManager.transport = 'tcp'
+
+# The Popen Command to launch the kernel. Override this if you have a custom
+# kernel. If kernel_cmd is specified in a configuration file, IPython does not
+# pass any arguments to the kernel, because it cannot make any assumptions about
+# the  arguments that the kernel understands. In particular, this means that the
+# kernel does not receive the option --debug if it given on the IPython command
+# line.
+# c.KernelManager.kernel_cmd = []
+
+# Set the kernel's IP address [default localhost]. If the IP address is
+# something other than localhost, then Consoles on other machines will be able
+# to connect to the Kernel, so be careful!
+# c.KernelManager.ip = ''
+
+#------------------------------------------------------------------------------
+# ProfileDir configuration
+#------------------------------------------------------------------------------
+
+# An object to manage the profile directory and its resources.
+# 
+# The profile directory is used by all IPython applications, to manage
+# configuration, logging and security.
+# 
+# This object knows how to find, create and manage these directories. This
+# should be used by any code that wants to handle profiles.
+
+# Set the profile location directly. This overrides the logic used by the
+# `profile` option.
+# c.ProfileDir.location = ''
+
+#------------------------------------------------------------------------------
+# Session configuration
+#------------------------------------------------------------------------------
+
+# Object for handling serialization and sending of messages.
+# 
+# The Session object handles building messages and sending them with ZMQ sockets
+# or ZMQStream objects.  Objects can communicate with each other over the
+# network via Session objects, and only need to work with the dict-based IPython
+# message spec. The Session will handle serialization/deserialization, security,
+# and metadata.
+# 
+# Sessions support configurable serialization via packer/unpacker traits, and
+# signing with HMAC digests via the key/keyfile traits.
+# 
+# Parameters ----------
+# 
+# debug : bool
+#     whether to trigger extra debugging statements
+# packer/unpacker : str : 'json', 'pickle' or import_string
+#     importstrings for methods to serialize message parts.  If just
+#     'json' or 'pickle', predefined JSON and pickle packers will be used.
+#     Otherwise, the entire importstring must be used.
+# 
+#     The functions must accept at least valid JSON input, and output *bytes*.
+# 
+#     For example, to use msgpack:
+#     packer = 'msgpack.packb', unpacker='msgpack.unpackb'
+# pack/unpack : callables
+#     You can also set the pack/unpack callables for serialization directly.
+# session : bytes
+#     the ID of this Session object.  The default is to generate a new UUID.
+# username : unicode
+#     username added to message headers.  The default is to ask the OS.
+# key : bytes
+#     The key used to initialize an HMAC signature.  If unset, messages
+#     will not be signed or checked.
+# keyfile : filepath
+#     The file containing a key.  If this is set, `key` will be initialized
+#     to the contents of the file.
+
+# The maximum number of digests to remember.
+# 
+# The digest history will be culled when it exceeds this value.
+# c.Session.digest_history_size = 65536
+
+# path to file containing execution key.
+# c.Session.keyfile = ''
+
+# Username for the Session. Default is your system username.
+# c.Session.username = 'jack'
+
+# The maximum number of items for a container to be introspected for custom
+# serialization. Containers larger than this are pickled outright.
+# c.Session.item_threshold = 64
+
+# The name of the unpacker for unserializing messages. Only used with custom
+# functions for `packer`.
+# c.Session.unpacker = 'json'
+
+# The UUID identifying this session.
+# c.Session.session = ''
+
+# The name of the packer for serializing messages. Should be one of 'json',
+# 'pickle', or an import name for a custom callable serializer.
+# c.Session.packer = 'json'
+
+# Debug output in the Session
+# c.Session.debug = False
+
+# The digest scheme used to construct the message signatures. Must have the form
+# 'hmac-HASH'.
+# c.Session.signature_scheme = 'hmac-sha256'
+
+# Threshold (in bytes) beyond which a buffer should be sent without copying.
+# c.Session.copy_threshold = 65536
+
+# execution key, for extra authentication.
+# c.Session.key = b''
+
+# Metadata dictionary, which serves as the default top-level metadata dict for
+# each message.
+# c.Session.metadata = {}
+
+# Threshold (in bytes) beyond which an object's buffer should be extracted to
+# avoid pickling.
+# c.Session.buffer_threshold = 1024
+
+#------------------------------------------------------------------------------
+# InlineBackend configuration
+#------------------------------------------------------------------------------
+
+# An object to store configuration of the inline backend.
+
+# Subset of matplotlib rcParams that should be different for the inline backend.
+# c.InlineBackend.rc = {'figure.facecolor': (1, 1, 1, 0), 'figure.edgecolor': (1, 1, 1, 0), 'savefig.dpi': 72, 'figure.subplot.bottom': 0.125, 'figure.figsize': (6.0, 4.0), 'font.size': 10}
+
+# The figure format to enable (deprecated use `figure_formats` instead)
+# c.InlineBackend.figure_format = ''
+
+# Close all figures at the end of each cell.
+# 
+# When True, ensures that each cell starts with no active figures, but it also
+# means that one must keep track of references in order to edit or redraw
+# figures in subsequent cells. This mode is ideal for the notebook, where
+# residual plots from other cells might be surprising.
+# 
+# When False, one must call figure() to create new figures. This means that
+# gcf() and getfigs() can reference figures created in other cells, and the
+# active figure can continue to be edited with pylab/pyplot methods that
+# reference the current active figure. This mode facilitates iterative editing
+# of figures, and behaves most consistently with other matplotlib backends, but
+# figure barriers between cells must be explicit.
+# c.InlineBackend.close_figures = True
+
+# Extra kwargs to be passed to fig.canvas.print_figure.
+# 
+# Logical examples include: bbox_inches, quality (for jpeg figures), etc.
+# c.InlineBackend.print_figure_kwargs = {'bbox_inches': 'tight'}
+
+# A set of figure formats to enable: 'png',  'retina', 'jpeg', 'svg', 'pdf'.
+# c.InlineBackend.figure_formats = {'png'}
+
+#------------------------------------------------------------------------------
+# MappingKernelManager configuration
+#------------------------------------------------------------------------------
+
+# A KernelManager that handles notebook mapping and HTTP error handling
+
+# MappingKernelManager will inherit config from: MultiKernelManager
+
+# The kernel manager class.  This is configurable to allow subclassing of the
+# KernelManager for customized behavior.
+# c.MappingKernelManager.kernel_manager_class = 'IPython.kernel.ioloop.IOLoopKernelManager'
+
+# 
+# c.MappingKernelManager.root_dir = '/Users/jack/Docs/comp402/Java8/dynamicjava'
+
+#------------------------------------------------------------------------------
+# NotebookManager configuration
+#------------------------------------------------------------------------------
+
+# Glob patterns to hide in file and directory listings.
+# c.NotebookManager.hide_globs = ['__pycache__']
+
+#------------------------------------------------------------------------------
+# FileNotebookManager configuration
+#------------------------------------------------------------------------------
+
+# FileNotebookManager will inherit config from: NotebookManager
+
+# Automatically create a Python script when saving the notebook.
+# 
+# For easier use of import, %run and %load across notebooks, a <notebook-
+# name>.py script will be created next to any <notebook-name>.ipynb on each
+# save.  This can also be set with the short `--script` flag.
+# c.FileNotebookManager.save_script = False
+
+# 
+# c.FileNotebookManager.notebook_dir = '/Users/jack/Docs/comp402/Java8/dynamicjava'
+
+# The directory name in which to keep notebook checkpoints
+# 
+# This is a path relative to the notebook's own directory.
+# 
+# By default, it is .ipynb_checkpoints
+# c.FileNotebookManager.checkpoint_dir = '.ipynb_checkpoints'
+
+# Glob patterns to hide in file and directory listings.
+# c.FileNotebookManager.hide_globs = ['__pycache__']
+
+#------------------------------------------------------------------------------
+# NotebookNotary configuration
+#------------------------------------------------------------------------------
+
+# A class for computing and verifying notebook signatures.
+
+# The hashing algorithm used to sign notebooks.
+# c.NotebookNotary.algorithm = 'sha256'
+
+# The file where the secret key is stored.
+# c.NotebookNotary.secret_file = ''
+
+# The secret key with which notebooks are signed.
+# c.NotebookNotary.secret = b''
diff --git a/dynamicjava/profile/static/custom/custom.css b/dynamicjava/profile/static/custom/custom.css
new file mode 100644
index 000000000..9f4abdaa4
--- /dev/null
+++ b/dynamicjava/profile/static/custom/custom.css
@@ -0,0 +1,7 @@
+/*
+Placeholder for custom user CSS
+
+mainly to be overridden in profile/static/custom/custom.css
+
+This will always be an empty file in IPython
+*/
\ No newline at end of file
diff --git a/dynamicjava/profile/static/custom/custom.js b/dynamicjava/profile/static/custom/custom.js
new file mode 100644
index 000000000..95aaece74
--- /dev/null
+++ b/dynamicjava/profile/static/custom/custom.js
@@ -0,0 +1,62 @@
+// leave at least 2 line with only a star on it below, or doc generation fails
+/**
+ *
+ *
+ * Placeholder for custom user javascript
+ * mainly to be overridden in profile/static/custom/custom.js
+ * This will always be an empty file in IPython
+ *
+ * User could add any javascript in the `profile/static/custom/custom.js` file
+ * (and should create it if it does not exist).
+ * It will be executed by the ipython notebook at load time.
+ *
+ * Same thing with `profile/static/custom/custom.css` to inject custom css into the notebook.
+ *
+ * Example :
+ *
+ * Create a custom button in toolbar that execute `%qtconsole` in kernel
+ * and hence open a qtconsole attached to the same kernel as the current notebook
+ *
+ *    $([IPython.events]).on('app_initialized.NotebookApp', function(){
+ *        IPython.toolbar.add_buttons_group([
+ *            {
+ *                 'label'   : 'run qtconsole',
+ *                 'icon'    : 'icon-terminal', // select your icon from http://fortawesome.github.io/Font-Awesome/icons
+ *                 'callback': function () {
+ *                     IPython.notebook.kernel.execute('%qtconsole')
+ *                 }
+ *            }
+ *            // add more button here if needed.
+ *            ]);
+ *    });
+ *
+ * Example :
+ *
+ *  Use `jQuery.getScript(url [, success(script, textStatus, jqXHR)] );`
+ *  to load custom script into the notebook.
+ *
+ *    // to load the metadata ui extension example.
+ *    $.getScript('/static/notebook/js/celltoolbarpresets/example.js');
+ *    // or
+ *    // to load the metadata ui extension to control slideshow mode / reveal js for nbconvert
+ *    $.getScript('/static/notebook/js/celltoolbarpresets/slideshow.js');
+ *
+ *
+ * @module IPython
+ * @namespace IPython
+ * @class customjs
+ * @static
+ */
+
+
+$([IPython.events]).on('notebook_loaded.Notebook', function(){
+    var md = IPython.notebook.metadata;
+     if(md.language){
+         console.log('language already defined and is :', md.language);
+     } else {
+         md.language = 'haskell' ;
+         console.log('add metadata hint that language is haskell...');
+     }
+});
+
+
diff --git a/dynamicjava/src/edu/rice/cs/dynamicjava/DynamicJava.java b/dynamicjava/src/edu/rice/cs/dynamicjava/DynamicJava.java
index dc49012d3..a57ffce3f 100644
--- a/dynamicjava/src/edu/rice/cs/dynamicjava/DynamicJava.java
+++ b/dynamicjava/src/edu/rice/cs/dynamicjava/DynamicJava.java
@@ -1,6 +1,8 @@
 package edu.rice.cs.dynamicjava;
 
 import java.io.*;
+
+import edu.rice.cs.dynamicjava.kernel.Kernel;
 import edu.rice.cs.plt.tuple.Option;
 import edu.rice.cs.plt.tuple.OptionVisitor;
 import edu.rice.cs.plt.text.TextUtil;
@@ -22,40 +24,48 @@ public static void main(String... args) throws IOException {
     ArgumentParser argParser = new ArgumentParser();
     argParser.supportOption("classpath", IOUtil.WORKING_DIRECTORY.toString());
     argParser.supportAlias("cp", "classpath");
+    argParser.supportOption("kernel", 1);
     ArgumentParser.Result parsedArgs = argParser.parse(args);
-    Iterable<File> cp = IOUtil.parsePath(parsedArgs.getUnaryOption("classpath"));
 
+    Iterable<File> cp = IOUtil.parsePath(parsedArgs.getUnaryOption("classpath"));
     Interpreter i = new Interpreter(Options.DEFAULT, new PathClassLoader(cp));
-    BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
-    String prev = null;
-    boolean blank = false;
-    String input;
-    do {
-      System.out.print("> ");
-      System.out.flush();
-      input = in.readLine();
-      if (input != null) {
-        // two blank lines trigger a recompute
-        if (input.equals("")) {
-          if (blank == true) { input = prev; blank = false; }
-          else { blank = true; }
-        }
-        else { prev = input; blank = false; }
-        try {
-          Option<Object> result = i.interpret(input);
-          result.apply(new OptionVisitor<Object, Void>() {
-            public Void forSome(Object o) { System.out.println(TextUtil.toString(o)); return null; }
-            public Void forNone() { return null; }
-          });
-        }
-        catch (InterpreterException e) { e.printUserMessage(); debug.log(e); }
-        catch (RuntimeException e) {
-          System.out.println("INTERNAL ERROR: Uncaught exception");
-          e.printStackTrace(System.out);
+
+    // If this is running as an iPython kernel
+    if (parsedArgs.hasOption("kernel")) {
+      String configPath = parsedArgs.getUnaryOption("kernel");
+      Kernel k = new Kernel(configPath, i);
+      k.start();
+    } else {
+      BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+      String prev = null;
+      boolean blank = false;
+      String input;
+      do {
+        System.out.print("> ");
+        System.out.flush();
+        input = in.readLine();
+        if (input != null) {
+          // two blank lines trigger a recompute
+          if (input.equals("")) {
+            if (blank == true) { input = prev; blank = false; }
+            else { blank = true; }
+          }
+          else { prev = input; blank = false; }
+          try {
+            Option<Object> result = i.interpret(input);
+            result.apply(new OptionVisitor<Object, Void>() {
+              public Void forSome(Object o) { System.out.println(TextUtil.toString(o)); return null; }
+              public Void forNone() { return null; }
+            });
+          }
+          catch (InterpreterException e) { e.printUserMessage(); debug.log(e); }
+          catch (RuntimeException e) {
+            System.out.println("INTERNAL ERROR: Uncaught exception");
+            e.printStackTrace(System.out);
+          }
+          System.out.println();
         }
-        System.out.println();
-      }
-    } while (input != null);
+      } while (input != null);
+    }
   }
-  
 }
diff --git a/dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/Interpreter.java b/dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/Interpreter.java
index 757717e82..775543c4c 100644
--- a/dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/Interpreter.java
+++ b/dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/Interpreter.java
@@ -1,6 +1,9 @@
 package edu.rice.cs.dynamicjava.interpreter;
 
 import java.io.StringReader;
+import java.util.Map;
+
+import edu.rice.cs.dynamicjava.symbol.LocalVariable;
 import edu.rice.cs.plt.tuple.Option;
 import edu.rice.cs.plt.tuple.Pair;
 import edu.rice.cs.plt.lambda.WrappedException;
@@ -17,7 +20,6 @@
  * The external interface for the interpreter.
  */
 public class Interpreter {
-
   private final Options _opt;
   private TypeContext _typeContext;
   private RuntimeBindings _bindings;
@@ -57,6 +59,10 @@ public Option<Object> interpret(String code) throws InterpreterException {
     _bindings = evalResult.first();
     return evalResult.second();
   }
+
+  public Map<LocalVariable, Object> getLocalVariables() {
+    return _bindings.getLocalVariables();
+  }
   
   private Iterable<Node> parse(String code) throws InterpreterException {
     try {
@@ -82,5 +88,4 @@ private Pair<RuntimeBindings, Option<Object>> evaluate(Iterable<Node> tree) thro
       else { throw e; }
     }
   }
-  
 }
diff --git a/dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/RuntimeBindings.java b/dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/RuntimeBindings.java
index ee51e02d7..12374ab6f 100644
--- a/dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/RuntimeBindings.java
+++ b/dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/RuntimeBindings.java
@@ -84,4 +84,12 @@ public Object getThis(DJClass c) {
     else { throw new IllegalArgumentException("This value " + c + " is undefined"); }
   }
 
+  public Map<LocalVariable, Object> getLocalVariables() {
+    Map<LocalVariable, Object> vars = new HashMap<LocalVariable, Object>();
+    if (_parent != null) {
+      vars.putAll(_parent.getLocalVariables());
+    }
+    vars.putAll(_vars);
+    return vars;
+  }
 }
diff --git a/dynamicjava/src/edu/rice/cs/dynamicjava/kernel/Autocompleter.java b/dynamicjava/src/edu/rice/cs/dynamicjava/kernel/Autocompleter.java
new file mode 100644
index 000000000..3ef9ea53e
--- /dev/null
+++ b/dynamicjava/src/edu/rice/cs/dynamicjava/kernel/Autocompleter.java
@@ -0,0 +1,361 @@
+package edu.rice.cs.dynamicjava.kernel;
+
+import edu.rice.cs.dynamicjava.interpreter.Interpreter;
+import edu.rice.cs.dynamicjava.symbol.LocalVariable;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.*;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+public class Autocompleter {
+  private Map<String, List<Class<?>>> packageClasses;
+  private Set<String> importedPackages;
+  private Interpreter i;
+
+  private static final String[] reserved = {
+      "abstract", "assert", "boolean", "break", "byte", "case", "catch",
+      "char", "class", "const", "continue", "default", "do", "double",
+      "else", "enum", "extends", "final", "finally", "float", "for",
+      "goto", "if", "implements", "import", "instanceof", "int", "interface",
+      "long", "native", "new", "package", "private", "protected", "public",
+      "return", "short", "static", "strictfp", "super", "switch", "synchronized",
+      "this", "throw", "throws", "transient", "try", "void", "volatile", "while"
+  };
+
+  private URL jdkURL;
+
+  public Autocompleter(Interpreter i) {
+    this.i = i;
+
+    try {
+      jdkURL = new URL("file:///System/Library//Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/");
+    } catch (MalformedURLException e) {
+      e.printStackTrace();
+    }
+
+    packageClasses = getPackageClasses(jdkURL);
+    importedPackages = new HashSet<String>();
+    importedPackages.add("java.lang");
+  }
+
+  private String[] splitDottedName(String name) {
+    return name.split(".");
+  }
+
+  /**
+   * Given a string of program text, return the last dotted name in the string. For example, when run on the string "x =
+   * System.out", should return "System.out".
+   *
+   * @param query A string of program text.
+   * @return The last dotted name in the string. If there is no dotted name, returns "".
+   */
+  private String getLastDottedName(String query) {
+    String name = query;
+    for (int i = query.length() - 1; i >= 0; i--) {
+      char c = query.charAt(i);
+      if (!(Character.isLetterOrDigit(c) || c == '.')) {
+        name = query.substring(i + 1);
+        break;
+      }
+    }
+
+    return name;
+  }
+
+  /**
+   * Create a mapping from package names to the classes in the package. Given a directory to search, find all the jars
+   * in that directory and inspect their packages and classes.
+   *
+   * @return A mapping from package names to class lists.
+   */
+  private Map<String, List<Class<?>>> getPackageClasses(URL searchURL) {
+    Map<String, List<Class<?>>> packageClasses = new HashMap<String, List<Class<?>>>();
+    Queue<File> directories = new LinkedList<File>();
+    String path = searchURL.getPath();
+    URLClassLoader loader = new URLClassLoader(new URL[]{searchURL});
+
+    if (path.endsWith(".jar")) {
+      getPackageClassesFromJar(loader, path, packageClasses);
+    } else {
+      File f = new File(path);
+      if (f.isDirectory()) {
+        directories.add(f);
+      }
+    }
+
+    while (directories.size() > 0) {
+      File dir = directories.remove();
+      for (File f : dir.listFiles()) {
+        if (f.isDirectory()) {
+          directories.add(f);
+        } else {
+          if (f.getPath().endsWith(".jar")) {
+            getPackageClassesFromJar(loader, f.getPath(), packageClasses);
+          }
+        }
+      }
+    }
+
+    return packageClasses;
+  }
+
+  /**
+   * Load all the classes in a jar into a mapping from package name to classes. Modifies packageClasses in place.
+   *
+   * @param loader         The classloader to use when loading classes.
+   * @param path           The path to the jar.
+   * @param packageClasses The mapping from package names to classes.
+   */
+  private void getPackageClassesFromJar(ClassLoader loader, String path, Map<String, List<Class<?>>> packageClasses) {
+    JarFile jarFile = null;
+    try {
+      jarFile = new JarFile(path);
+      Enumeration<JarEntry> entries = jarFile.entries();
+      while (entries.hasMoreElements()) {
+        JarEntry entry = entries.nextElement();
+
+        String entryName = entry.getName();
+        if (entryName.endsWith(".class")) {
+          String packageName = entryName.substring(0, entryName.lastIndexOf("/")).replace('/', '.');
+          if (!packageClasses.containsKey(packageName)) {
+            packageClasses.put(packageName, new ArrayList<Class<?>>(0));
+          }
+
+          String className = entryName.substring(0, entryName.length() - 6).replace('/', '.');
+
+          try {
+            packageClasses.get(packageName).add(loader.loadClass(className));
+          } catch (ClassNotFoundException e) {
+            //System.out.format("Failed to load class %s\n", className);
+          }
+        }
+      }
+    } catch (Exception e) {
+      e.printStackTrace();
+    } finally {
+      try {
+        if (jarFile != null) {
+          jarFile.close();
+        }
+      } catch (Exception e) {
+        e.printStackTrace();
+      }
+    }
+  }
+
+  public String resolvePackage(String name) {
+    String[] nameParts = splitDottedName(name);
+    String packageName = "";
+    for (String part : nameParts) {
+      packageName += "." + part;
+      if (packageClasses.keySet().contains(packageName)) {
+        return packageName;
+      }
+    }
+    return "";
+  }
+
+  private boolean matches(String prefix, String name) {
+    return name.startsWith(prefix) && !name.equals(prefix);
+  }
+
+  private Set<String> resolveDottedName(Class<?> base, List<String> name) {
+    Set<String> results = new HashSet<String>(100);
+
+    // Resolve the field after the dot. For example, if the input is "x.field1.field2.methodPrefix", we should resolve
+    // to field2. The name after the final dot is assumed to be partial, so it will be looked up in the field.
+    String part;
+    boolean matchedPart = false;
+    while (name.size() > 1) {
+      part = name.remove(0);
+      for (Field f : base.getFields()) {
+        if (f.getName() == part) {
+          base = f.getClass();
+          matchedPart = true;
+        }
+      }
+      if (!matchedPart) { return results; }
+    }
+
+    // Take the final part of the name and look it up in the preceding field.
+    part = name.remove(0);
+
+    Field[] fields = base.getFields();
+    for (Field f : fields) {
+      String fieldName = f.getName();
+      if (matches(part, fieldName)) {
+        results.add(fieldName);
+      }
+    }
+
+    Method[] methods = base.getMethods();
+    for (Method m : methods) {
+      String methodName = m.getName();
+      if (matches(part, methodName)) {
+        results.add(methodName);
+      }
+    }
+
+    return results;
+  }
+
+  private Set<String> completeLocalVariableContents(String name) {
+    Set<String> results = new HashSet<String>(100);
+    Map<LocalVariable, Object> locals = i.getLocalVariables();
+
+    if (name.indexOf(".") == -1) {
+      return results;
+    }
+
+    // Split the name into components.
+    List<String> nameParts = new ArrayList<String>(Arrays.asList(name.split("\\.")));
+    if (name.endsWith(".")) {
+      nameParts.add("");
+    }
+
+    // Attempt to look up the first component as a local variable.
+    String part = nameParts.remove(0);
+    Class<?> partClass = null;
+    for (LocalVariable l : locals.keySet()) {
+      String varName = l.declaredName();
+      if (part.equals(varName)) {
+        partClass = locals.get(l).getClass();
+        break;
+      }
+    }
+
+    // If the looking up the first component of the name fails, then it must not be a local variable.
+    if (partClass == null) {
+      return results;
+    }
+
+    return resolveDottedName(partClass, nameParts);
+  }
+
+  private List<String> completeLocalVariable(String name) {
+    List<String> results = new LinkedList<String>();
+    for (LocalVariable l : i.getLocalVariables().keySet()) {
+      String varName = l.declaredName();
+      if (matches(name, varName)) {
+        results.add(varName);
+      }
+    }
+    return results;
+  }
+
+  private List<String> completeReserved(String name) {
+    List<String> results = new LinkedList<String>();
+    for (String r : reserved) {
+      if (matches(name, r)) {
+        results.add(name);
+      }
+    }
+    return results;
+  }
+
+  private List<String> completePackageName(String name) {
+    List<String> results = new LinkedList<String>();
+    for (String packageName : packageClasses.keySet()) {
+      if (matches(name, packageName)) {
+        results.add(packageName);
+      }
+    }
+    return results;
+  }
+
+  private List<String> completeQualifiedClass(String name) {
+    List<String> results = new LinkedList<String>();
+
+    if (!name.contains(".")) {
+      return results;
+    }
+    String packageName = name.substring(0, name.indexOf("."));
+    String classPrefix = name.substring(name.indexOf(".") + 1);
+
+    if (packageClasses.containsKey(packageName)) {
+      for (Class<?> c : packageClasses.get(packageName)) {
+        String className = c.getSimpleName();
+        if (matches(classPrefix, className)) {
+          results.add(className);
+        }
+      }
+    }
+    return results;
+  }
+
+  private List<String> completeImportedClass(String name) {
+    List<String> results = new LinkedList<String>();
+
+    for (String packageName : importedPackages) {
+      if (packageClasses.containsKey(packageName)) {
+        for (Class<?> c : packageClasses.get(packageName)) {
+          String className = c.getSimpleName();
+          if (matches(name, className)) {
+            results.add(className);
+          }
+        }
+      }
+    }
+
+    return results;
+  }
+
+  private Set<String> completeImportedClassContents(String name) {
+    Set<String> results = new HashSet<String>(100);
+    Map<LocalVariable, Object> locals = i.getLocalVariables();
+
+    if (name.indexOf(".") == -1) {
+      return results;
+    }
+
+    // Split the name into components.
+    List<String> nameParts = new ArrayList<String>(Arrays.asList(name.split("\\.")));
+    if (name.endsWith(".")) {
+      nameParts.add("");
+    }
+
+    // Attempt to look up the first component as a class
+    String part = nameParts.remove(0);
+    Class<?> partClass = null;
+    for (String packageName : importedPackages) {
+      if (packageClasses.containsKey(packageName)) {
+        for (Class<?> c : packageClasses.get(packageName)) {
+          String className = c.getSimpleName();
+          if (matches(part, className)) {
+            partClass = c;
+            break;
+          }
+        }
+      }
+    }
+
+    // If the looking up the first component of the name fails, then it must not be a local variable.
+    if (partClass == null) {
+      return results;
+    }
+
+    return resolveDottedName(partClass, nameParts);
+  }
+
+  public String[] complete(String query) {
+    List<String> results = new ArrayList<String>(100);
+
+    String name = getLastDottedName(query);
+
+    results.addAll(completeLocalVariable(name));
+    results.addAll(completeLocalVariableContents(name));
+    results.addAll(completeReserved(name));
+    results.addAll(completePackageName(name));
+    results.addAll(completeQualifiedClass(name));
+    results.addAll(completeImportedClass(name));
+    results.addAll(completeImportedClassContents(name));
+
+    return results.toArray(new String[results.size()]);
+  }
+}
diff --git a/dynamicjava/src/edu/rice/cs/dynamicjava/kernel/IKernelRunnable.java b/dynamicjava/src/edu/rice/cs/dynamicjava/kernel/IKernelRunnable.java
new file mode 100644
index 000000000..1c18d5352
--- /dev/null
+++ b/dynamicjava/src/edu/rice/cs/dynamicjava/kernel/IKernelRunnable.java
@@ -0,0 +1,6 @@
+package edu.rice.cs.dynamicjava.kernel;
+
+public interface IKernelRunnable extends Runnable {
+  public void start();
+  public void shutdown();
+}
diff --git a/dynamicjava/src/edu/rice/cs/dynamicjava/kernel/Kernel.java b/dynamicjava/src/edu/rice/cs/dynamicjava/kernel/Kernel.java
new file mode 100644
index 000000000..0b278cfff
--- /dev/null
+++ b/dynamicjava/src/edu/rice/cs/dynamicjava/kernel/Kernel.java
@@ -0,0 +1,290 @@
+package edu.rice.cs.dynamicjava.kernel;
+
+import edu.rice.cs.dynamicjava.interpreter.Interpreter;
+import edu.rice.cs.dynamicjava.interpreter.InterpreterException;
+import edu.rice.cs.plt.text.TextUtil;
+import edu.rice.cs.plt.tuple.Option;
+import edu.rice.cs.plt.tuple.OptionVisitor;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.zeromq.ZMQ;
+import org.zeromq.ZContext;
+import org.zeromq.ZMsg;
+
+import java.io.ByteArrayOutputStream;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.PrintStream;
+import java.net.URLClassLoader;
+import java.util.UUID;
+import java.util.concurrent.*;
+
+public class Kernel {
+  private final UUID session;
+
+  private final IKernelRunnable heartbeat;
+  private final IKernelRunnable executor;
+  private final Thread control;
+
+  private final ByteArrayOutputStream out;
+  private final ByteArrayOutputStream err;
+
+  public Kernel(String configPath, Interpreter i) throws FileNotFoundException {
+    session = UUID.randomUUID();
+    out = new ByteArrayOutputStream();
+    err = new ByteArrayOutputStream();
+
+    // Open JSON config file passed to kernel.
+    JSONObject config = new JSONObject(new JSONTokener(new FileReader(configPath)));
+    String transport = config.getString("transport");
+    String ip = config.getString("ip");
+
+    // Initialize ZMQ.
+    ZContext ctx = new ZContext();
+
+    // Bind ZMQ ports.
+    String hbAddr = String.format("%s://%s:%d", transport, ip, config.getInt("hb_port"));
+    heartbeat = new Heartbeat(ctx, hbAddr);
+
+    String shellAddr = String.format("%s://%s:%d", transport, ip, config.getInt("shell_port"));
+    String iopubAddr = String.format("%s://%s:%d", transport, ip, config.getInt("iopub_port"));
+    executor = new Executor(i, session, ctx, shellAddr, iopubAddr, out, err);
+
+    String controlAddr = String.format("%s://%s:%d", transport, ip, config.getInt("control_port"));
+    control = new Control(heartbeat, executor, session, ctx, controlAddr);
+  }
+
+  private static class Heartbeat extends Thread implements IKernelRunnable {
+    private final ZMQ.Socket skt;
+    private volatile boolean isRunning = true;
+
+    public Heartbeat(ZContext ctx, String addr) {
+      skt = ctx.createSocket(ZMQ.REP);
+      skt.bind(addr);
+    }
+
+    public void shutdown() {
+      isRunning = false;
+    }
+
+    @Override
+    public void run() {
+      while (isRunning) {
+        byte[] msg = skt.recv();
+        skt.send(msg, msg.length);
+      }
+    }
+  }
+
+  private static class Executor extends Thread implements IKernelRunnable {
+    private final Interpreter interpreter;
+    private final UUID session;
+    private final ZMQ.Socket shellSkt;
+    private final ZMQ.Socket iopubSkt;
+    private final ByteArrayOutputStream out;
+    private final ByteArrayOutputStream err;
+    private Future<Autocompleter> autocompleter;
+
+    private int execCount = 1;
+    private volatile boolean isRunning = true;
+
+    public Executor(Interpreter i, UUID session, ZContext ctx, String shellAddr, String iopubAddr,
+                    ByteArrayOutputStream out, ByteArrayOutputStream err) {
+      this.interpreter = i;
+      this.session = session;
+      this.out = out;
+      this.err = err;
+
+      shellSkt = ctx.createSocket(ZMQ.ROUTER);
+      shellSkt.bind(shellAddr);
+      iopubSkt = ctx.createSocket(ZMQ.PUB);
+      iopubSkt.bind(iopubAddr);
+
+      // Creating the autocompleter takes a long time, so do that asynchronously.
+      ExecutorService executor = Executors.newSingleThreadExecutor();
+      autocompleter = executor.submit(new Callable<Autocompleter>() {
+        @Override
+        public Autocompleter call() throws Exception {
+          return new Autocompleter(interpreter);
+        }
+      });
+      executor.shutdown();
+    }
+
+    public void shutdown() {
+      isRunning = false;
+    }
+
+
+    @Override
+    public void run() {
+      while (isRunning) {
+        Message msg = new Message(ZMsg.recvMsg(shellSkt));
+
+        String msgType = msg.getHeader().getString("msg_type");
+        JSONObject msgContent = msg.getContent();
+
+        if (msgType.equals("kernel_info_request")) {
+          JSONObject content = new JSONObject();
+          content.put("protocol_version", new JSONArray("[4,1]"));
+          content.put("language", "java");
+          content.put("language_version", new JSONArray("[1,7]"));
+          msg.respond(session, "kernel_info_reply", content).serialize().send(shellSkt);
+        } else if (msgType.equals("complete_request")) {
+          String query = msgContent.getString("text");
+
+          String[] results = {};
+          if (autocompleter.isDone()) {
+            try {
+              results = autocompleter.get().complete(query);
+            } catch (InterruptedException e) {
+              e.printStackTrace();
+            } catch (ExecutionException e) {
+              e.printStackTrace();
+            }
+          }
+
+          JSONObject retContent = new JSONObject();
+          retContent.put("matches", new JSONArray(results));
+          retContent.put("status", "ok");
+          retContent.put("matched_text", query);
+
+          msg.respond(session, "complete_reply", retContent).serialize().send(shellSkt);
+        } else if (msgType.equals("execute_request")) {
+          // Send a kernel status message that the kernel is busy executing.
+          JSONObject retContent = new JSONObject();
+          retContent.put("execution_state", "busy");
+          msg.respond(session, "status", retContent).serialize().send(iopubSkt);
+
+          String code = msgContent.getString("code");
+
+          // Rebroadcast the code that is being executed.
+          retContent = new JSONObject();
+          retContent.put("code", code);
+          retContent.put("execution_count", execCount);
+          msg.respond(session, "pyin", retContent).serialize().send(iopubSkt);
+
+          // Begin execution.
+          try {
+            Option<Object> result = interpreter.interpret(code);
+
+            // Broadcast stdout and stderr.
+            retContent = new JSONObject();
+            retContent.put("name", "stdout");
+            retContent.put("data", out.toString());
+            out.reset();
+            msg.respond(session, "stream", retContent).serialize().send(iopubSkt);
+
+            retContent = new JSONObject();
+            retContent.put("name", "stderr");
+            retContent.put("data", err.toString());
+            err.reset();
+            msg.respond(session, "stream", retContent).serialize().send(iopubSkt);
+
+            // Broadcast execution result as a string.
+            if (result.isSome()) {
+              String resultStr = result.apply(new OptionVisitor<Object, String>() {
+                public String forSome(Object o) {
+                  return TextUtil.toString(o);
+                }
+
+                public String forNone() {
+                  return "";
+                }
+              });
+
+              retContent = new JSONObject();
+              retContent.put("execution_count", execCount);
+              JSONObject data = new JSONObject();
+              data.put("text/plain", resultStr);
+              retContent.put("data", data);
+              retContent.put("metadata", new JSONObject());
+              msg.respond(session, "pyout", retContent).serialize().send(iopubSkt);
+            }
+
+            // Send a kernel status message that the kernel is now idle.
+            retContent = new JSONObject();
+            retContent.put("execution_state", "idle");
+            msg.respond(session, "status", retContent).serialize().send(iopubSkt);
+
+            // Send a reply message to the execution request.
+            retContent = new JSONObject();
+            retContent.put("execution_count", execCount);
+            retContent.put("status", "ok");
+            retContent.put("payload", new JSONArray());
+            retContent.put("user_variables", new JSONObject());
+            retContent.put("user_expressions", new JSONObject());
+            msg.respond(session, "execute_reply", retContent).serialize().send(shellSkt);
+          } catch (InterpreterException e) {
+            // Send a kernel status message that the kernel is now idle.
+            retContent = new JSONObject();
+            retContent.put("execution_state", "idle");
+            msg.respond(session, "status", retContent).serialize().send(iopubSkt);
+
+            // Send a reply message to the execution request.
+            retContent = new JSONObject();
+            retContent.put("execution_count", execCount);
+            retContent.put("status", "error");
+            retContent.put("ename", e.getClass().getSimpleName());
+            retContent.put("evalue", e.getUserMessage());
+            JSONArray traceback = new JSONArray();
+            for (StackTraceElement te : e.getStackTrace()) {
+              traceback.put(te.toString());
+            }
+            retContent.put("traceback", traceback);
+            msg.respond(session, "execute_reply", retContent).serialize().send(shellSkt);
+          }
+          execCount += 1;
+        } else if (msgType.equals("shutdown_request")) {
+        } else {
+          System.out.format("ERROR: Unknown message type: %s\n", msgType);
+        }
+      }
+    }
+  }
+
+  private static class Control extends Thread {
+    private final UUID session;
+    private final ZMQ.Socket skt;
+    private final IKernelRunnable heartbeat;
+    private final IKernelRunnable executor;
+
+    public Control(IKernelRunnable heartbeat, IKernelRunnable executor, UUID session, ZContext ctx, String addr) {
+      this.heartbeat = heartbeat;
+      this.executor = executor;
+      this.session = session;
+      skt = ctx.createSocket(ZMQ.ROUTER);
+      skt.bind(addr);
+    }
+
+    @Override
+    public void run() {
+      while (true) {
+        Message msg = new Message(ZMsg.recvMsg(skt));
+        String msgType = msg.getHeader().getString("msg_type");
+        if (msgType.equals("shutdown_request")) {
+          executor.shutdown();
+          heartbeat.shutdown();
+
+          JSONObject retContent = new JSONObject();
+          retContent.put("restart", "false");
+          msg.respond(session, "shutdown_reply", retContent).serialize().send(skt);
+          return;
+        }
+      }
+    }
+  }
+
+  public void start() {
+    heartbeat.start();
+    executor.start();
+    control.start();
+
+    // Replace System.out, System.err with custom streams so that we can capture their output.
+    PrintStream kernelOut = new PrintStream(out, true);
+    PrintStream kernelErr = new PrintStream(err, true);
+    System.setOut(kernelOut);
+    System.setErr(kernelErr);
+  }
+}
diff --git a/dynamicjava/src/edu/rice/cs/dynamicjava/kernel/Message.java b/dynamicjava/src/edu/rice/cs/dynamicjava/kernel/Message.java
new file mode 100644
index 000000000..6f2b054b4
--- /dev/null
+++ b/dynamicjava/src/edu/rice/cs/dynamicjava/kernel/Message.java
@@ -0,0 +1,110 @@
+package edu.rice.cs.dynamicjava.kernel;
+
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.zeromq.ZFrame;
+import org.zeromq.ZMsg;
+
+import java.nio.charset.Charset;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.TimeZone;
+import java.util.UUID;
+
+public class Message {
+  private static byte[] delimiter = { '<','I','D','S','|','M','S','G','>' };
+
+  private LinkedList<byte[]> prefix;
+  private JSONObject header;
+  private JSONObject parent_header;
+  private JSONObject metadata;
+  private JSONObject content;
+
+  public Message(LinkedList<byte[]> prefix,
+                 JSONObject header,
+                 JSONObject parentHeader,
+                 JSONObject metadata,
+                 JSONObject content) {
+    this.prefix = prefix;
+    this.header = header;
+    parent_header = parentHeader;
+    this.metadata = metadata;
+    this.content = content;
+  }
+
+  public Message(ZMsg msg) {
+    // Pop the parts of the message up to the message delimiter and save them in the prefix list.
+    prefix = new LinkedList<byte[]>();
+    while (true) {
+      ZFrame identifier = msg.pop();
+      if (identifier.streq("<IDS|MSG>")) {
+        break;
+      } else {
+        prefix.add(identifier.getData());
+      }
+    }
+
+    // Pop HMAC.
+    msg.pop();
+
+    header = new JSONObject(new JSONTokener(msg.popString()));
+    parent_header = new JSONObject(new JSONTokener(msg.popString()));
+    metadata = new JSONObject(new JSONTokener(msg.popString()));
+    content = new JSONObject(new JSONTokener(msg.popString()));
+  }
+
+  public Message respond(UUID session, String msgType, JSONObject content) {
+    JSONObject newHeader = new JSONObject();
+
+    TimeZone tz = TimeZone.getTimeZone("UTC");
+    DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'");
+    df.setTimeZone(tz);
+    String nowAsISO = df.format(new Date());
+
+    newHeader.put("date", nowAsISO);
+    newHeader.put("msg_id", UUID.randomUUID().toString());
+    newHeader.put("username", System.getProperty("user.name"));
+    newHeader.put("session", session.toString());
+    newHeader.put("msg_type", msgType);
+    return new Message(prefix, newHeader, header, metadata, content);
+  }
+
+  public ZMsg serialize() {
+    ZMsg msg = new ZMsg();
+    Charset utf8 = Charset.forName("UTF-8");
+    for (byte[] identifier : prefix) {
+      msg.push(identifier);
+    }
+    msg.add(delimiter);
+    msg.add("".getBytes(utf8));
+    msg.add(header.toString().getBytes(utf8));
+    msg.add(parent_header.toString().getBytes(utf8));
+    msg.add(metadata.toString().getBytes(utf8));
+    msg.add(content.toString().getBytes(utf8));
+    return msg;
+  }
+
+  @Override
+  public String toString() {
+    return String.format("{\n'header': %s\n'parent_header': %s\n'metadata': %s\n'content': %s\n}",
+      getHeader().toString(), getParentHeader().toString(), getMetadata().toString(), getContent().toString());
+  }
+
+  public JSONObject getHeader() {
+    return header;
+  }
+
+  public JSONObject getParentHeader() {
+    return parent_header;
+  }
+
+  public JSONObject getMetadata() {
+    return metadata;
+  }
+
+  public JSONObject getContent() {
+    return content;
+  }
+}
diff --git a/plt/build.xml b/plt/build.xml
index 6597c8e18..80e5f8813 100644
--- a/plt/build.xml
+++ b/plt/build.xml
@@ -3,7 +3,7 @@
 <!-- This build script is based on the template located at "trunk/misc/build-template.xml"
      in the DrJava Subversion repository.  In general, changes made to the script should be
      reflected in the template as well. -->
-     
+
 <project name="plt" default="help">
 
   <property name="readable-project-name" value="PLT Utilities" />
@@ -26,22 +26,22 @@
   <property name="plt.debug.log" value="${debug}" />
   <property name="error" value="stderr" />
   <property name="plt.error.log" value="${error}" />
-  <property name="clean-can-fail" value="yes" /> 
+  <property name="clean-can-fail" value="yes" />
   <property name="link-source" value="no" />
-  
+
   <property environment="env" />
   <property name="java7-home" value="${env.JAVA7_HOME}" />
   <property name="java6-home" value="${env.JAVA6_HOME}" />
   <property name="java5-home" value="${env.JAVA5_HOME}" />
   <property name="clover-jar" value="${env.CLOVER_JAR}" />
   <property name="findbugs-home" value="${env.FINDBUGS_HOME}" />
-  
+
   <property name="is-development" value="yes" /> <!-- Development or stable release -->
   <property name="tag-append" value="" /> <!-- "stable", "beta", or none -->
-  
+
   <!-- Don't use or inherit the CLASSPATH environment variable for anything -->
   <property name="build.sysclasspath" value="ignore" />
-  
+
   <!-- Extension that defines the "extendclasspath" task.  This should be a standard feature of Ant, but
        as long as it's not, we can use this extension from the Clover developers. -->
   <taskdef resource="com/cenqua/ant/antlib.xml" classpath="lib/buildlib/cenquatasks.jar" />
@@ -51,17 +51,17 @@
 
   <!-- fornum task, used for test-repeat -->
   <taskdef name="fornum" classname="edu.rice.cs.plt.ant.ForNumTask" classpath="lib/buildlib/plt-ant.jar" onerror="report" />
-  
+
   <extendclasspath path="lib/buildlib/junit.jar" />
 
   <fileset id="libs" dir="lib" includes="*.jar" /> <!-- Only include jars that are at the top level (not in buildlib) -->
-  
-  
-  
+
+
+
   <!-- ************
        Help Targets
        ************ -->
-  
+
   <target name="help" description="Print general build script information">
     <echo message="----------------------------------------------------------------------" />
     <echo message="${readable-project-name} Build Scripts" />
@@ -89,7 +89,7 @@
     <echo message="CLASSPATH will be ignored -- classes on the system class path will " />
     <echo message="not be visible during the build process." />
   </target>
-  
+
   <target name="options" description="Print the list of customizable options">
     <echo message="----------------------------------------------------------------------" />
     <echo message="${readable-project-name} Build Script Customizable Options" />
@@ -129,36 +129,36 @@
     <echo message="       stderr)" />
   </target>
 
-  
-  
+
+
   <!-- ************
        Build Target
        ************ -->
-  
+
   <target name="build" depends="test, jar" description="Shortcut for 'test' and 'jar'">
   </target>
-  
+
 
   <!-- *******************
        Compilation Targets
        ******************* -->
-       
+
   <target name="compile" depends="do-compile, copy-resources, unjar-libs"
           description="Compile all source files">
   </target>
-  
+
   <target name="do-compile" depends="resolve-java7-runtime">
-  
+
     <echo message="Compiling src directory to classes/base and classes/test with command 'javac'" />
-    
+
     <mkdir dir="classes/base" />
     <mkdir dir="classes/test" />
-    
+
     <!-- Move any test classes back to base to prevent recompilation -->
     <move todir="classes/base">
       <fileset dir="classes/test" includes="**/*" />
     </move>
-    
+
     <javac srcdir="src" destdir="classes/base" source="1.5" target="1.5"
            bootclasspath="${java5-runtime}" sourcepath="" includeAntRuntime="no"
            executable="javac" fork="yes" memoryMaximumSize="512M"
@@ -170,13 +170,13 @@
       </classpath>
       <compilerarg value="-Xlint" />
       <!-- Ignore serial warnings, because they occur for every Throwable definition (among others) -->
-      <compilerarg value="-Xlint:-serial" /> 
+      <compilerarg value="-Xlint:-serial" />
       <!-- Use the next line to compile against other sources, ignoring any unneeded classes.
            This can be useful in creating a pruned version of a jar file for the lib directory.
            (You must also clear the sourcepath="" option.)
       <include name="${src-working-dir}/**/*.java" /> -->
     </javac>
-    
+
     <mkdir dir="classes/test" /> <!-- May be deleted by the previous move -->
     <move todir="classes/test">
       <fileset dir="classes/base">
@@ -187,10 +187,10 @@
         <!-- Additional test classes should be listed here -->
       </fileset>
     </move>
-    
+
   </target>
-  
-    
+
+
   <target name="copy-resources">
     <copy todir="classes/base">
       <fileset dir="src">
@@ -205,15 +205,15 @@
       </fileset>
     </copy>
   </target>
-  
-  
+
+
   <target name="unjar-libs">
     <antcall target="do-unjar-libs">
       <param name="generate-sourcedir" value="lib" />
       <param name="generate-dir" value="classes/lib" />
     </antcall>
   </target>
-  
+
   <target name="do-unjar-libs" depends="check-generate-dir-from-dir" unless="already-generated">
     <echo message="Unjarring jar files in the lib directory" />
     <!-- Delete "classes/lib" in case it exists (but is out of date) -->
@@ -224,13 +224,13 @@
       <patternset excludes="META-INF/**" />
     </unjar>
   </target>
-  
-  
+
+
 
   <!-- ***************
        Testing Targets
        *************** -->
-  
+
   <target name="test" depends="compile" unless="skip-test"
           description="Run all tests (after compiling); use -Dtest-spec=... to filter">
     <antcall target="iterate-tests">
@@ -251,15 +251,15 @@
       <param name="test-jvm" value="${java6-exec}" />
     </antcall>
   </target>
-  
+
   <target name="test-5" depends="compile, resolve-java5-exec" unless="skip-test"
           description="Run all tests under Java 5 (after compiling); use -Dtest-spec=... to filter">
     <antcall target="iterate-tests">
       <param name="test-jvm" value="${java5-exec}" />
     </antcall>
   </target>
-  
-  
+
+
   <target name="iterate-tests" depends="resolve-test-formatter-class">
     <!-- Calls do-test, unless that is overridden by the caller -->
     <property name="do-test-target" value="do-test" />
@@ -271,12 +271,12 @@
     <condition property="test-output-to-file" value="yes" else="no">
       <equals arg1="${test-formatter}" arg2="xml" />
     </condition>
-    
+
     <!-- Repeat tests 'test-repeat' times. -->
     <fornum count="${test-repeat}" param="iteration">
       <sequential>
         <trycatch property="test-failure" reference="test-failure-ref">
-        
+
           <try>
             <for list="${test-spec}" param="test-filter-string-iter">
               <sequential>
@@ -294,7 +294,7 @@
               </then>
             </if>
           </try>
-          
+
           <catch>
             <if>
               <istrue value="${test-halt}" />
@@ -303,7 +303,7 @@
               </then>
             </if>
           </catch>
-          
+
           <finally>
             <if>
               <istrue value="${test-output-to-file}" />
@@ -316,9 +316,9 @@
               </then>
             </if>
           </finally>
-          
+
         </trycatch>
-        
+
         <if>
           <isset property="test-iteration-message" />
           <then>
@@ -328,10 +328,10 @@
             <echo message="Completed test iteration ${iteration1} of ${test-repeat}" />
           </then>
         </if>
-        
+
       </sequential>
     </fornum>
-    
+
     <!-- Handle errors where test-halt is false -->
     <if>
       <isset property="test-failure" />
@@ -340,10 +340,10 @@
         <throw refid="test-failure-ref" />
       </then>
     </if>
-    
+
   </target>
-  
-  
+
+
   <target name="do-test" depends="resolve-jvm-args">
     <echo message="Running all tests matching '${test-filter-string}' with command '${test-jvm}'" />
     <junit haltonfailure="${test-halt}" failureproperty="test-failed"
@@ -380,8 +380,8 @@
   <!-- ***********
        Jar Targets
        *********** -->
-       
-  <target name="jar" depends="compile, resolve-version-tag" 
+
+  <target name="jar" depends="compile"
           description="Create the jar file with all classes and libs (compiling first)">
     <jar jarfile="${ant.project.name}.jar">
       <manifest>
@@ -393,7 +393,7 @@
     </jar>
   </target>
 
-  <target name="jar-base" depends="compile, resolve-version-tag" 
+  <target name="jar-base" depends="compile, resolve-version-tag"
           description="Create the jar file without any support libs (compiling first)">
     <jar jarfile="${ant.project.name}-base.jar">
       <manifest>
@@ -409,7 +409,7 @@
   <!-- *********************
        Documentation Targets
        ********************* -->
-  
+
   <target name="javadoc" depends="resolve-version-tag"
           description="Generate javadocs from the source folder">
     <antcall target="do-javadoc">
@@ -417,7 +417,7 @@
       <param name="generate-dir" value="docs/javadoc" />
     </antcall>
   </target>
-  
+
   <target name="do-javadoc" depends="check-generate-dir-from-dir" unless="already-generated">
     <echo message="Generating javadocs" />
     <delete dir="docs/javadoc" />
@@ -433,17 +433,17 @@
       <!-- Additional external library APIs may be listed here -->
     </javadoc>
   </target>
-  
-  
-  <target name="clover" depends="clean, setup-clover, test, report-clover" 
+
+
+  <target name="clover" depends="clean, setup-clover, test, report-clover"
           description="Generate a Clover test coverage report" />
-  
-  <target name="clover-6" depends="clean, setup-clover, test-6, report-clover" 
+
+  <target name="clover-6" depends="clean, setup-clover, test-6, report-clover"
           description="Generate a Clover test coverage report under Java 6" />
-  
-  <target name="clover-5" depends="clean, setup-clover, test-5, report-clover" 
+
+  <target name="clover-5" depends="clean, setup-clover, test-5, report-clover"
           description="Generate a Clover test coverage report under Java 5" />
-  
+
   <target name="report-clover" depends="resolve-version-tag">
     <echo message="Generating Clover report" />
     <clover-report>
@@ -499,18 +499,18 @@
   </target>
 
 
-  
+
   <!-- *************
        Clean Targets
        ************* -->
-       
+
   <target name="clean" depends="clean-intermediate, clean-products"
           description="Remove all build products; the result should match the intended Subversion contents">
   </target>
 
   <target name="clean-intermediate" unless="skip-clean">
     <echo message="Deleting all intermediate build products" />
-    
+
     <delete dir="classes" failonerror="${clean-can-fail}" />
     <delete dir="cloverdb" failonerror="${clean-can-fail}" />
 
@@ -529,15 +529,15 @@
         <!-- Additional files to delete may be listed here -->
       </fileset>
     </delete>
-    
+
   </target>
-  
+
   <target name="clean-products" unless="skip-clean">
     <echo message="Deleting all final build products" />
-    
+
     <delete dir="docs" failonerror="${clean-can-fail}" />
     <delete dir="testResults" failonerror="${clean-can-fail}" />
-    
+
     <delete includeemptydirs="true" failonerror="${clean-can-fail}">
       <fileset dir="${basedir}" defaultexcludes="no">
         <include name="*.jar" />
@@ -546,15 +546,15 @@
         <include name="*.exe" />
       </fileset>
     </delete>
-    
+
   </target>
 
 
 
   <!-- ******************
-       Subversion Targets 
+       Subversion Targets
        ****************** -->
-  
+
   <target name="update" depends="clean" description="Reconcile source with the Subversion archive">
     <echo message="Running Subversion update" />
     <exec executable="svn" failonerror="yes">
@@ -564,8 +564,8 @@
       <arg value="status" />
     </exec>
   </target>
-  
-  <target name="commit" depends="update, build" 
+
+  <target name="commit" depends="update, build"
           description="Commit source to the Subversion archive (after building)">
     <antcall target="clean-intermediate"> <!-- Clean up after the latest build -->
       <param name="clean-can-fail" value="no" />
@@ -594,8 +594,8 @@
       <arg value="Created tag ${version-tag}" />
     </exec>
   </target>
-  
-  <target name="branch" depends="update" 
+
+  <target name="branch" depends="update"
           description="Copy the working copy to a new Subversion branch (after updating)">
     <echo message="This will create a new branch from your working copy.  If there are changes " />
     <echo message="in your copy that have not been committed, you may want to do so first, " />
@@ -616,7 +616,7 @@
   <!-- ***************
        Release Targets
        *************** -->
-       
+
   <target name="release-stable" description="Make a 'stable' version release">
     <antcall target="release">
       <param name="tag-append" value="-stable" />
@@ -630,7 +630,7 @@
       <param name="is-development" value="no" />
     </antcall>
   </target>
-       
+
   <target name="release-local-stable" description="Make a 'stable' version release without touching Subversion">
     <antcall target="release">
       <param name="tag-append" value="-stable" />
@@ -646,19 +646,19 @@
       <param name="skip-tag" value="yes" />
     </antcall>
   </target>
-       
+
   <target name="release-local" description="Make a development release without touching Subversion">
     <antcall target="release">
       <param name="skip-tag" value="yes" />
     </antcall>
   </target>
-       
+
   <target name="release"
-          depends="update, build, tag, src-zip, jar-app, javadoc-zip" 
+          depends="update, build, tag, src-zip, jar-app, javadoc-zip"
           description="Make a development release">
     <delete dir="${version-tag}" />
   </target>
-  
+
   <target name="src-zip" depends="resolve-version-tag" unless="skip-tag">
     <echo message="Creating ${version-tag}-src.zip" />
     <exec executable="svn" failonerror="yes">
@@ -670,7 +670,7 @@
       <zipfileset dir="${version-tag}/src" prefix="${version-tag}/src" />
     </zip>
   </target>
-  
+
   <target name="jar-app" depends="jar, assert-jar-exists, resolve-version-tag">
     <echo message="Creating ${version-tag}.jar" />
     <copy file="${ant.project.name}.jar" tofile="${version-tag}.jar" />
@@ -682,7 +682,7 @@
       <zipfileset dir="docs/javadoc" prefix="${version-tag}/javadoc" />
     </zip>
   </target>
-  
+
   <!-- We don't include this in the standard release process, because we don't want to
        include instrumented files in the release, and because Clover must be run on a
        licensed machine -->
@@ -698,7 +698,7 @@
   <!-- ********************************
        Misc Occasionally-Useful Targets
        ******************************** -->
-  
+
   <patternset id="exclude-binaries">
     <exclude name="**/*.jar" />
     <exclude name="**/*.class" />
@@ -719,8 +719,8 @@
       <patternset refid="exclude-binaries" />
     </replace>
   </target>
-  
-  <!-- Standardize all newline character sequences.  Subversion takes care of this 
+
+  <!-- Standardize all newline character sequences.  Subversion takes care of this
        automatically, but sometimes files crop up with the wrong sequence.
        Use "svn status" after running this to see which files were fixed. -->
   <target name="fix-newlines" description="Standardize newline character sequences in all text files">
@@ -734,7 +734,7 @@
       <patternset refid="exclude-binaries" />
     </fixcrlf>
   </target>
-  
+
   <!-- Replace the header of each .java source file with the contents of LICENSE, delimited by
        BEGIN_COPYRIGHT_BLOCK and END_COPYRIGHT_BLOCK. -->
   <target name="relicense" description="Paste the contents of LICENSE in all Java source files">
@@ -754,10 +754,10 @@
     </replaceregexp>
   </target>
 
-  
-  
+
+
   <!-- ***************************
-       Property-resolution Targets 
+       Property-resolution Targets
        *************************** -->
 
   <target name="resolve-java7-runtime">
@@ -775,7 +775,7 @@
 
     <fail message="Can't find rt.jar in the Java 7 home: ${java7-home}" unless="java7-runtime" />
   </target>
-  
+
   <target name="resolve-java7-exec">
     <!-- We rely on "location" to generate a platform-specific path -->
 
@@ -786,13 +786,13 @@
         <os family="windows" />
       </and>
     </condition>
-    
+
     <property name="java7-exec-2" location="${java7-home}/bin/java" />
     <available property="java7-exec" value="${java7-exec-2}" file="${java7-exec-2}" />
 
     <fail message="Can't find the java executable in the Java 7 home: ${java7-home}" unless="java7-exec" />
   </target>
- 
+
   <target name="resolve-java6-runtime">
     <!-- We rely on "location" to generate a platform-specific path; note that properties
          are immutable and so java6-runtime will only be set the *first* time. -->
@@ -808,7 +808,7 @@
 
     <fail message="Can't find rt.jar in the Java 6 home: ${java6-home}" unless="java6-runtime" />
   </target>
-  
+
   <target name="resolve-java6-exec">
     <!-- We rely on "location" to generate a platform-specific path -->
 
@@ -819,13 +819,13 @@
         <os family="windows" />
       </and>
     </condition>
-    
+
     <property name="java6-exec-2" location="${java6-home}/bin/java" />
     <available property="java6-exec" value="${java6-exec-2}" file="${java6-exec-2}" />
 
     <fail message="Can't find the java executable in the Java 6 home: ${java6-home}" unless="java6-exec" />
   </target>
-  
+
   <target name="resolve-java5-runtime">
     <!-- We rely on "location" to generate a platform-specific path; note that properties
          are immutable and so java5-runtime will only be set the *first* time. -->
@@ -841,7 +841,7 @@
 
     <fail message="Can't find rt.jar in the Java 5 home: ${java5-home}" unless="java5-runtime" />
   </target>
-  
+
   <target name="resolve-java5-exec">
     <!-- We rely on "location" to generate a platform-specific path -->
 
@@ -852,30 +852,30 @@
         <os family="windows" />
       </and>
     </condition>
-    
+
     <property name="java5-exec-2" location="${java5-home}/bin/java" />
     <available property="java5-exec" value="${java5-exec-2}" file="${java5-exec-2}" />
 
     <fail message="Can't find the java executable in the Java 5 home: ${java5-home}" unless="java5-exec" />
   </target>
-  
-  
+
+
   <target name="assert-jar-exists">
     <available property="jar-exists" file="${ant.project.name}.jar" />
     <fail message="Can't find ${ant.project.name}.jar" unless="jar-exists" />
   </target>
-  
+
   <target name="assert-clover-jar-exists">
     <available property="clover-jar-exists" file="${clover-jar}" />
     <fail message="${clover-jar} does not exist" unless="clover-jar-exists" />
   </target>
-  
+
   <target name="assert-findbugs-exists">
     <available property="findbugs-exists" file="${findbugs-home}/lib/findbugs.jar" />
     <fail message="${findbugs-home}/lib/findbugs.jar does not exist" unless="findbugs-exists" />
   </target>
-  
-  
+
+
   <target name="resolve-development-value">
     <condition property="development-value" value="true">
       <istrue value="${is-development}" />
@@ -883,7 +883,7 @@
     <!-- else... -->
     <property name="development-value" value="false" />
   </target>
-  
+
   <target name="resolve-jvm-args">
     <condition property="jvm-args" value="-server">
       <istrue value="${force-server}" />
@@ -891,7 +891,7 @@
     <!-- else... -->
     <property name="jvm-args" value="" />
   </target>
-  
+
   <target name="resolve-test-formatter-class">
     <condition property="test-formatter-class"
                value="edu.rice.cs.plt.ant.QuietJUnitResultFormatter">
@@ -917,7 +917,7 @@
     <property name="test-formatter-class"
               value="edu.rice.cs.plt.ant.OneLineJUnitResultFormatter" />
   </target>
-  
+
   <target name="resolve-version-tag" depends="resolve-svn-revision">
     <!-- Get a timestamp based on GMT, rather than local time -->
     <tstamp>
@@ -927,7 +927,7 @@
     </tstamp>
     <property name="version-tag"
               value="${ant.project.name}${tag-append}-${DSTAMP}-r${svn-revision}" />
-  </target>  
+  </target>
 
   <!-- Sets is-modified if "svn status" has non-empty output. -->
   <target name="resolve-is-modified" depends="clean">
@@ -940,7 +940,7 @@
       </not>
     </condition>
   </target>
-  
+
   <!-- Sets svn-revision to the current "Last Changed Rev" of "svn info". -->
   <target name="resolve-svn-revision">
     <exec executable="svn" failonerror="yes" output="svn-info.txt">
@@ -957,7 +957,7 @@
     </loadfile>
     <delete file="svn-info.txt" />
   </target>
-  
+
 
   <!-- Sets "already-generated" if "generate-file" is more recent than "generate-sourcefile";
        otherwise, the out-of-date target file is deleted (if it exists).  Note that, since
@@ -981,15 +981,15 @@
     <available file="${generate-file}" property="already-generated" />
   </target>
 
-  <!-- Sets "already-generated" if "generate-dir" was created (or modified) more recently 
-       than "generate-sourcefile".  Note that, since properties can only be set once, this 
+  <!-- Sets "already-generated" if "generate-dir" was created (or modified) more recently
+       than "generate-sourcefile".  Note that, since properties can only be set once, this
        should happen underneath an "antcall". -->
   <target name="check-generate-dir-from-file">
     <uptodate property="already-generated" targetfile="${generate-dir}" srcfile="${generate-sourcefile}" />
   </target>
-  
-  <!-- Sets "already-generated" if "generate-dir" was created (or modified) more recently 
-       than everything in "generate-sourcedir".  Note that, since properties can only be 
+
+  <!-- Sets "already-generated" if "generate-dir" was created (or modified) more recently
+       than everything in "generate-sourcedir".  Note that, since properties can only be
        set once, this should happen underneath an "antcall". -->
   <target name="check-generate-dir-from-dir">
     <!-- Unfortunately, a bug in uptodate prevents this from working properly,