Win 1 & win 2 are complete, ready to merge