Tooltips are in and functioning correctly.  Also modularized and cleaned up code