Overlay

I'm leaving a pull request open but this needs tests.