finishing up cli tool