Merge pull request #246 from Useful-Innovation/johans-fixes

added crud for estimates