working on current price
first draft at standardized cost basis
Merge branch 'walport-water' into testing