an eventual rewrite of most of new-entry