add turret, almost works
pre-merge
resolved merge conflicts with Matt