Started reworking Granularity Class