Beginnings of a proper command-line interface