Major class changes

What's new

What's removed

Additional notes