cleaned up thistle; added queue; did not test lol