cleanup and begin to work on breadcrumbs