More command line arguments feature branch