added valuation model and functionality
merged stuff