Feature/entities/disk

Yep, thanks