Some refactoring of the CLI done. Midway through implementing Maxscore.