Yeah, I have never been keen on the classes being tied to the weapons. I think all classes and jobs need to be managed in a way that we can change the class/job as we do now by clicking on an option to do so, versus having to change weapons.