initial import from working sources