add rest of vy's work