SECOND COMMIT
Working Bubble and HEatmap not yet connected though