More reorganization and added database stuff
A few tweaks to databas stuff