Feature/entities/disk

Both fixed