broke apart different entities and added a count entity that might be frivolous