initial update for server.js and database.js