making progress
merge