Most of the db stuff added, need to go back and rename a lot of them, and really still decide where this is going