Initial merge with server.  Added files for running on server