Refactor using harp/money