debugged valuation issues, needs refactor to clean up