can we make this generic and/or somehow have it not fail for non-pact stuff?