Big :+1: for extracting this base class.