WIP: Areas and volumes

I'll ping you when ready
Sorted