lots more hacking, starting to get down to needed data now
Merge branch 'master' of https://github.com/herrold/tool-tips