added some preliminary eval stuff