Feature/218 improve cost coverage

https://trello.com/c/vJkBKKQj/218-improve-cost-coverage
Almost self documenting. Improved very muchly. Good