improved queen

Next step: THE END by merging graph + queen