CLI almost complete