WIP: starting to rewrite pypi