Some progress
merged
All