A little more work on the REPL