pep-395 wip