Actually make this usable from CLI