More implementation, partial implementation of overlays