Added Penetration, Changes to Wave, Energy WIP