Power-ups Issue #12

Commit of left over uncommitted changes