SQL updates
Merge pull request #17 from Caf131/dev-doo-dah-cforehand

SQL updates