Major Overhaul

I should have it future-proofed now, and I made it a tad easier to
maintain.