WE HAVE CUSTOMIZATION

Meaning, I added specific definition methods for the two relevant
classes. I also cleaned up some of the compilation. Tody was a good day.