Add CLI, fixing #4