Lots of changes

Renaming
Refactoring DB work
Adding new cool stuff
Removing old and not cool stuff