additional changes

Additional changes to get this closer to supporting multiple zones.