Ongoing refactor to deal with entries one at a time