Fields are identical, silly git
Add knowPackage and havePackage predicates
Add basic structure of runoff