Overlay work.
Merge branch 'feature/overlay' into develop