This is a part of work towards fixing #4 and #3 - this will allow more characters, but doesn't address validation failures.