DROIDS: Make CLI working