Closes #70.  FINALLY.  This took forever.