Start of rewrites to make mounts extend horses