More refactoring, advancing towards different menus depending on errors.