start changing return type to []Val, breaks build for now