Started merging Val and Exp datatypes + closures