REPL rework