Put in breadcrumbs, fixed other issues
Improved tests, made to work with refactoring