Commit new changes

Updates to start_server