beginning of policies model, some other cleanup
Model development