urgh god, merging badness on my part