Work on merging the ContentTip -> ContententTipHandler