work on denormalizing a little more data, broke a lot of stuff