Get rid of repl connect thang
Fix compile error
First step in adding some tests. Need to add a few more to get better coverage. And refactor. And... that.
TODOs