Feature/entities/disk

Right, `trailing closures` are super cool. Fixing