Feature/entities/disk

@Lascorbe taught me it's redundant to initialize these to `nil`.