Implemented initial command line wrapper