Dang, I screwed up the merge. This should be better