Add commandline parser and what not