Hope you got a nice bonus for pulling this off so fast (but working for the state, I doubt it).

There is another way of structuring the fact table which would...