logic a bit better but still wrong
Fixed most of the turn ordering bugs
More tweaking