I have all decorator functions working. Adding the generator now.