added bubbles
think things are merged right now