move everything over to new lambda syntax