Initial work on reworking data evaluation