This code is like WAY cleaner. It doesn't look that way from the diff, but look at the raw file. Let me know if anything about how it works is still confusing or strange.