Attempt at cleaning up the overlay.
Commonize.
More commonize.