Works on my end

Only touched these files
Merge pull request #78 from HexSoftware/Databaseworkalready

Works on my end