Better handling and checking of databases
Merge pull request #38 from TheRyanHowell/feature/Dev

Better handling and checking of databases