Class loading implemented properly (I'm going sleep)