Ok. I've updated @TransistorFM's schema stuff here.

Anything else I should do?