Some work on pipeline, silly errors, given Entities a name