Modified DatabaseManager and DatabaseHandler

Think they both are done as far as we've discussed.