Almost done! I'm still too tired to be sure of exactly what happened here.