Cleaned up to make use of the hpess/base improvements