More Class Loading

Did more work on class loading