More coverage and refactoring.
Turning hacks into actual good code.
Burning down the intarwebz.