Added Crossbowman, moved some logic