WIP feat #996 class reload mechanism