Update C/S for Databases

Things still need to be done, but I'm unsure of how to do them, and how
to fit the code in database.java into the C/S stuff