Added queen, still bugs