More changes...this thing is ridiculous and unsalvageable...  I'll write my own from scratch.