Initial import from current working sources