Add command line parser, need testing