Uploaded some more progress, and this should be a stable version of convergence_test branch