add trim back in, keep substr --- deprecate trim in favor of substring, but don't remove functionality yet...