Overlay changes

Reviewers: @donovanhide, @ximinez, @rec
Think of it as a "todo" note