Implementing kodemage's suggestion of moving to command line arguments