Should this be moved to the es module?