Another backup copy; getting ready to merge this back into martin-async now.