work in progress
merged