Unifying models
Cleaning up QPP.cs