Goshen works to rebuild