Changes: Powerup and subclasses
Merged