Closer to goal

Added in better data structure. THIS VERSION DOESN’T DO ANYTHING. It is
a stepping stone on the way to something better.