still unstable - clean up some class loading procedures