This should work once I can actually authenticate the database....

I hope this commit doesn't break anything....