Adding areas and volumes

I'll ping you when ready