@JensTimmerman: I'm confused. Which TopHat PR should be merged in first?