Move new_class dict into main area, get it work when back home
update