Update (non-working)

Added Unicode friendly code, but still have to resolve tokenising and line splitting issues. At some point, nil strings are being passé rout of these functions and it's not entirely easy to identify them...