Energy Pistol

I'm not sure what's with the other commits. But they seem to not be affecting anything.