Add CLI.  Add more generic API.  API needs to be dumbed down.