Cleanup
Added weapon logic.