...nearly done
merging