Added additional command line stuff including commons cli support.