Consolodate sarnold

It seems like some recent work was done on the overlay, it might be worth merging.