Lots of changes getting ready for weapon implementations
Signed-off-by:Matt Haidet <matthaidet17@marist.com>