All but swap_strategy and final done

Almost there!!