First pass at new gap handling code complete