Feature/entities/disk

The amazing underscore!