More Work Done. Some Code Cleanup. Add proper Breadcrumbs