More work on issue.
WOrk on breadcrumbs in prod
Testing.