BIG CHANGE - quotes changed from HashMap to Order(), need to go back and
do some basic functionality testing.