Fixed strategy selection with the updated structure code - need to fix nav bugs, need to finish containment.