[#111 state:resolved] [#357 state:resolved] refactor and test breadcrumbs