Consolidates the balloon class
Merges with master