trick17 and redcross combined

for updates and new builds