power up merge

Exp ball needs debugging