first iteration of hacking in classloading setting
first iteration of hacking (missed these files)