Feature

Turn Zone geometry into Generic Models.