Feature/entities/disk

Yep.