Merge cashflow branch

Merge the cost and revenue model into master