Update for Engine animation/AI overhaul

Also move gaggle and piece merging logic to Engine