Begin making it work outside the weapons branch