WIP tooltip refactor
Tooltip refactor complete
Merge branch 'tooltip-refactor' into develop