adding mostly everything from server team