Updated for the new DatabaseConnector

Mostly changing function names
Changed things up a little to fit the new database connector