Feature/entities/disk

![](http://i.giphy.com/GYU7rBEQtBGfe.gif)