Everything should now be updated, and I tweaked a few things to make the class more... interesting, I hope.
