Major Update

Stops blowing the CPU