Add primitiv CLI, little refactor