Changed how the mapper splits. Splits all but a few corner cases successfully now