Merge pull request #122 from KayenEQ/master

Revisions to how charm works.
Fix for SQL