refactor of historic sync. Handles all know scenarios