World Storage Entities

Eventually I will merge this in