Initial refactor of evoked code