Added initial CLI parser