switching out class system for homegrown one
Merge branch 'master' into class
shortening
class tweaks
regen class rebuild