All but contingency checking doneish