DRAFT: Refactor

building hpi for testing