- Added TODO issue for overlay logic