ripped out old CLI API. Aieeee\!