overlays are sexy and awesome now
resolved merge