Implementing better cli. (halfway)
Implemented better cli. (halfway)