Continued working on the framework for weapons