Refactored things a bit. Actually fix thee infinite power thing