more refactoring; adding the beginnings of the infoBubble