more work on chores
merging manifest