Add some simple classes
Add Bubble more