Entitlement Refactoring

Prior to christmas, we have found lacking capabilities and weird behaviour in PXPs handling of entitlements. We refactor this to create a solid foundation to build upon