99% finished. Need to fix final deltas