Initial import of dpath from working sources