separated power out and removed inheritance from old entity class