Fraig partially done

Some difficult merge not done