Tooltip logic added (not showing yet)