Found a couple more places to go from class to data-lift