more changes to ingest
updated ingest to work with merge
back to basics
merge stuff
slightly working ingest now in
fixed typo