cuppy added, prep done, and git clean up from generated code