Moving overlap into its own module