Major re-work of String class, in progress