Overlay changes

Reviewers: @donovanhide, @ximinez, @rec
`useHandshake` is more C++ and less Pythonic.