our next goal is to shrink this class some more :)