Further moving things in the direction of one program without needing the batch file.