Timing

I don't know why I branched. Maybe because master was in a good spot? That point is now tagged as 'timing'.