Torhal is awesome

Torhal cleaned up a bunch of my code and made things much more efficent