Reworked turn generation

not fully working yet... results not quite right.
Will fix tomorrow.