158 tooltips

Re-merging into the right branch this time