new world order with fewer data structures, less duplicated logic