(2.3.0-wip) WIP trying to get tooltips working correctly