Clean up and somewhat finish the future work