WIP- restructuring hipops