Updated to have CLI args too