Started working on a new site class and grid generator