Updates to app.'s to make it work with server.js