First commit and add bubbles functionality