Delete generated code and add drafted code from before