Basic ingesting

latest changes from basic-ingesting. Keeping branch open, cause it ain't done yet.