First commit for PS2, along with some data models
Minor changes to the bubble datastructure