WIP: update to include sectors!