Started implementation of CLI (Card #13)