making progress
merged?