Golly

I've been trying to merge this shenanery for almost half an hour.....