Re-worked Overlay to BaseOverlay