Implementing C-o (#22)