Overlay changes

Reviewers: @donovanhide, @ximinez, @rec
You have enough changes to justify submitting your own patch