Dev

pulling lots of ingest code into the main repository.