Added basics for evaluation - incomplete