Work on estimates
Update CHANGELOG.md