Switch to 2of12 dictionary; support exhaustive lists