workingish
merging