Continued working on a more complete repl