Add comment overlay. Logic needed
fix conflicts