Changes to allow for thuestates that aren't mere strings