Power ups

Merging