Finished a couple of the TODOs in bubbleview class