ADD: Mr clerestory things (1st batch)