add CLI, prepare for demo