updated model to allow multiple year runs (a bit broken)
multiyear fixed
changing POC to amount to fix non conservations
resolving conflicts