Feature/refactor ingest spec

Closes #135