Feature/entities/disk

Alright, agree with being swift hipsters :+1: