Well, I didn't make a ton of headway, but I hope to fix it soon. Sorry for all
the lame commits.