diff --git a/new/AutoItInterpreter/AssemblyInfo.cs b/new/AutoItInterpreter/AssemblyInfo.cs
index 548d9a67..96583d38 100644
--- a/new/AutoItInterpreter/AssemblyInfo.cs
+++ b/new/AutoItInterpreter/AssemblyInfo.cs
@@ -1,15 +1,15 @@
 
 //////////////////////////////////////////////////////////////////////////
-// Autogenerated 2020-07-13 10:29:19.365                                //
+// Autogenerated 2020-07-13 15:26:52.055                                //
 // ANY CHANGES TO THIS DOCUMENT WILL BE LOST UPON RE-GENERATION         //
 //////////////////////////////////////////////////////////////////////////
 
 using System.Reflection;
 using System;
 
-[assembly: AssemblyVersion("0.5.1045.20195")]
-[assembly: AssemblyFileVersion("0.5.1045.20195")]
-[assembly: AssemblyInformationalVersion("53153e693226163009d9ef9f010a66e9762ffbde")]
+[assembly: AssemblyVersion("0.5.1055.20195")]
+[assembly: AssemblyFileVersion("0.5.1055.20195")]
+[assembly: AssemblyInformationalVersion("b577bfd8fb4d7256e4ed61801285a044356294bb")]
 [assembly: AssemblyCompany("Unknown6656")]
 [assembly: AssemblyCopyright("Copyright © 2018 - 2020, Unknown6656")]
 [assembly: AssemblyProduct("AutoIt3 Interpreter by Unknown6656")]
@@ -20,6 +20,6 @@ public static class __module__
     public static string Author { get; } = "Unknown6656";
     public static string Year { get; } = "2018 - 2020";
     public static string Copyright { get; } = "Copyright © 2018 - 2020, Unknown6656";
-    public static Version? InterpreterVersion { get; } = Version.Parse("0.5.1045.20195");
-    public static string GitHash { get; } = "53153e693226163009d9ef9f010a66e9762ffbde";
+    public static Version? InterpreterVersion { get; } = Version.Parse("0.5.1055.20195");
+    public static string GitHash { get; } = "b577bfd8fb4d7256e4ed61801285a044356294bb";
 }
diff --git a/new/AutoItInterpreter/AutoItInterpreter.csproj b/new/AutoItInterpreter/AutoItInterpreter.csproj
index 9262b793..d9d8912a 100644
--- a/new/AutoItInterpreter/AutoItInterpreter.csproj
+++ b/new/AutoItInterpreter/AutoItInterpreter.csproj
@@ -3,7 +3,7 @@
         <OutputType>Exe</OutputType>
         <TargetFramework>net5.0</TargetFramework>
         <Nullable>enable</Nullable>
-        <StartupObject>$Program.$Main</StartupObject>
+        <!--<StartupObject>$Program.$Main</StartupObject>-->
         <OutDir>$(SolutionDir)bin</OutDir>
         <LangVersion>preview</LangVersion>
         <Deterministic>false</Deterministic>
diff --git a/new/AutoItInterpreter/Extensibility/Plugins.Au3Framework.Functions.cs b/new/AutoItInterpreter/Extensibility/Plugins.Au3Framework.Functions.cs
index c69d3ebf..ec624a5c 100644
--- a/new/AutoItInterpreter/Extensibility/Plugins.Au3Framework.Functions.cs
+++ b/new/AutoItInterpreter/Extensibility/Plugins.Au3Framework.Functions.cs
@@ -132,19 +132,19 @@ public sealed class FrameworkFunctions
             ProvidedNativeFunction.Create(nameof(ObjName), 1, 2, ObjName, 1),
             ProvidedNativeFunction.Create(nameof(StringAddCR), 1, StringAddCR),
             ProvidedNativeFunction.Create(nameof(StringCompare), 2, 3, StringCompare, Variant.Zero),
-            ProvidedNativeFunction.Create(nameof(StringFormat), , StringFormat),
-            ProvidedNativeFunction.Create(nameof(StringFromASCIIArray), , StringFromASCIIArray),
-            ProvidedNativeFunction.Create(nameof(StringInStr), , StringInStr),
+            ProvidedNativeFunction.Create(nameof(StringFormat), 1, 33, StringFormat),
+            // ProvidedNativeFunction.Create(nameof(StringFromASCIIArray), , StringFromASCIIArray),
+            // ProvidedNativeFunction.Create(nameof(StringInStr), , StringInStr),
             ProvidedNativeFunction.Create(nameof(StringLeft), 2, StringLeft),
             ProvidedNativeFunction.Create(nameof(StringLen), 1, StringLen),
             ProvidedNativeFunction.Create(nameof(StringLower), 1, StringLower),
             ProvidedNativeFunction.Create(nameof(StringMid), 2, 3, StringMid, -1),
-            ProvidedNativeFunction.Create(nameof(StringRegExp), , StringRegExp),
-            ProvidedNativeFunction.Create(nameof(StringRegExpReplace ), , StringRegExpReplace ),
-            ProvidedNativeFunction.Create(nameof(StringReplace), , StringReplace),
-            ProvidedNativeFunction.Create(nameof(StringReverse), , StringReverse),
+            // ProvidedNativeFunction.Create(nameof(StringRegExp), , StringRegExp),
+            // ProvidedNativeFunction.Create(nameof(StringRegExpReplace ), , StringRegExpReplace ),
+            // ProvidedNativeFunction.Create(nameof(StringReplace), , StringReplace),
+            // ProvidedNativeFunction.Create(nameof(StringReverse), , StringReverse),
             ProvidedNativeFunction.Create(nameof(StringRight), 2, StringRight),
-            ProvidedNativeFunction.Create(nameof(StringSplit), , StringSplit),
+            // ProvidedNativeFunction.Create(nameof(StringSplit), , StringSplit),
             ProvidedNativeFunction.Create(nameof(StringStripCR), 1, StringStripCR),
             ProvidedNativeFunction.Create(nameof(StringStripWS), 2, StringStripWS),
             ProvidedNativeFunction.Create(nameof(StringToASCIIArray), 1, 4, StringToASCIIArray, Variant.Zero, Variant.Default, Variant.Zero),
@@ -1477,6 +1477,7 @@ public static FunctionReturnValue ObjGet(CallFrame frame, Variant[] args)
             string path = args[0].ToString();
 
 
+            throw new NotImplementedException();
         }
 
         public static FunctionReturnValue ObjName(CallFrame frame, Variant[] args)
@@ -1503,19 +1504,17 @@ public static FunctionReturnValue ObjName(CallFrame frame, Variant[] args)
             _ => StringComparison.CurrentCultureIgnoreCase,
         });
 
-        public static FunctionReturnValue StringFormat(CallFrame frame, Variant[] args)
-        {
-        }
-
-        public static FunctionReturnValue StringFromASCIIArray(CallFrame frame, Variant[] args)
-        {
-
-        }
-
-        public static FunctionReturnValue StringInStr(CallFrame frame, Variant[] args)
-        {
+        public static FunctionReturnValue StringFormat(CallFrame frame, Variant[] args) => (Variant)StringFormatter.FormatString(args[0].ToString(), args[1..]);
 
-        }
+        // public static FunctionReturnValue StringFromASCIIArray(CallFrame frame, Variant[] args)
+        // {
+        // 
+        // }
+        // 
+        // public static FunctionReturnValue StringInStr(CallFrame frame, Variant[] args)
+        // {
+        // 
+        // }
 
         public static FunctionReturnValue StringLeft(CallFrame frame, Variant[] args)
         {
@@ -1543,25 +1542,25 @@ public static FunctionReturnValue StringMid(CallFrame frame, Variant[] args)
             return (Variant)(len < 0 ? "" : str.Substring(start, len));
         }
 
-        public static FunctionReturnValue StringRegExp(CallFrame frame, Variant[] args)
-        {
-
-        }
-
-        public static FunctionReturnValue StringRegExpReplace(CallFrame frame, Variant[] args)
-        {
-
-        }
-
-        public static FunctionReturnValue StringReplace(CallFrame frame, Variant[] args)
-        {
-
-        }
-
-        public static FunctionReturnValue StringReverse(CallFrame frame, Variant[] args)
-        {
-
-        }
+        // public static FunctionReturnValue StringRegExp(CallFrame frame, Variant[] args)
+        // {
+        // 
+        // }
+        // 
+        // public static FunctionReturnValue StringRegExpReplace(CallFrame frame, Variant[] args)
+        // {
+        // 
+        // }
+        // 
+        // public static FunctionReturnValue StringReplace(CallFrame frame, Variant[] args)
+        // {
+        // 
+        // }
+        // 
+        // public static FunctionReturnValue StringReverse(CallFrame frame, Variant[] args)
+        // {
+        // 
+        // }
 
         public static FunctionReturnValue StringRight(CallFrame frame, Variant[] args)
         {
@@ -1575,10 +1574,10 @@ public static FunctionReturnValue StringRight(CallFrame frame, Variant[] args)
             });
         }
 
-        public static FunctionReturnValue StringSplit(CallFrame frame, Variant[] args)
-        {
-
-        }
+        // public static FunctionReturnValue StringSplit(CallFrame frame, Variant[] args)
+        // {
+        // 
+        // }
 
         public static FunctionReturnValue StringStripCR(CallFrame frame, Variant[] args) => (Variant)args[0].ToString().Replace("\r", "");
 
diff --git a/new/AutoItInterpreter/Properties/launchSettings.json b/new/AutoItInterpreter/Properties/launchSettings.json
index 06f41030..a4d59613 100644
--- a/new/AutoItInterpreter/Properties/launchSettings.json
+++ b/new/AutoItInterpreter/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "AutoItInterpreter": {
       "commandName": "Project",
-      "commandLineArgs": "-vv -t ../test/test"
+      "commandLineArgs": "-vq -t ../test/unittest-stringformat"
     }
   }
 }
\ No newline at end of file
diff --git a/new/AutoItInterpreter/Runtime/AU3Thread.cs b/new/AutoItInterpreter/Runtime/AU3Thread.cs
index 249b1802..65c93950 100644
--- a/new/AutoItInterpreter/Runtime/AU3Thread.cs
+++ b/new/AutoItInterpreter/Runtime/AU3Thread.cs
@@ -274,6 +274,44 @@ protected override Union<InterpreterError, Variant> InternalExec(Variant[] args)
     public sealed class AU3CallFrame
         : CallFrame
     {
+        private const RegexOptions _REGEX_OPTIONS = RegexOptions.IgnoreCase | RegexOptions.Compiled;
+        private static readonly Regex REGEX_INTERNAL_LABEL = new Regex(@"^§\w+$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_VARIABLE = new Regex(@"\$([^\W\d]|[^\W\d]\w*)\b", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_GOTO = new Regex(@"^goto\s+(?<label>.+)$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_WHILE = new Regex(@"^while\s+(?<expression>.+)$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_WEND = new Regex(@"^wend$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_NEXT = new Regex(@"^next$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_EXIT = new Regex(@"^exit(\b\s*(?<code>.+))?$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_RETURN = new Regex(@"^return(\b\s*(?<value>.+))?$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_FOR = new Regex(@"^for\s+.+$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_FORTO = new Regex(@"^for\s+(?<start>.+)\s+to\s+(?<stop>.+?)(\s+step\s+(?<step>.+))?$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_FORIN = new Regex(@"^for\s+(?<variable>.+)\s+in\s+(?<expression>.+)$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_FORIN_VARIABLES = new Regex(@"^\$(?<key>[^\W\d]|[^\W\d]\w*)\s*,\s*\$(?<value>[^\W\d]|[^\W\d]\w*)$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_WITH = new Regex(@"^with\s+(?<variable>.+)$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_ENDWITH = new Regex(@"^endwith$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_REDIM = new Regex(@"^redim\s+(?<expression>.+)$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_DO = new Regex(@"^do$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_UNTIL = new Regex(@"^until\s+(?<expression>.+)$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_IF = new Regex(@"^(?<elif>else)?if\s+(?<condition>.+)\s+then$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_ELSE = new Regex(@"^else$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_ENDIF = new Regex(@"^endif$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_DECLARATION_MODIFIER = new Regex(@"^(local|static|global|const|dim|enum|step)\b", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_ENUM_STEP = new Regex(@"^(?<op>[+\-*]?)(?<step>\d+)\b", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_INCLUDE = new Regex(@"^include?\s+(?<open>[""'<])(?<path>(?:(?!\k<close>).)+)(?<close>[""'>])$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_CONTINUELOOP_EXITLOOP = new Regex(@"^(?<mode>continue|exit)loop\s*(?<level>.+)?\s*$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_SELECT = new Regex(@"^select$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_ENDSELECT = new Regex(@"^endselect$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_SWITCH = new Regex(@"^switch\b\s*(?<expression>.+)$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_ENDSWITCH = new Regex(@"^endswitch$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_CASE = new Regex(@"^case\b\s*(?<expression>.+)*$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_CONTINUECASE = new Regex(@"^continuecase$", _REGEX_OPTIONS);
+
+        private readonly ConcurrentDictionary<string, IEnumerator<(Variant key, Variant value)>> _iterators = new();
+        private readonly ConcurrentStack<Variable> _withcontext_stack = new ConcurrentStack<Variable>();
+        private readonly ConcurrentStack<bool> _if_stack = new ConcurrentStack<bool>();
+        private readonly ConcurrentStack<string> _while_stack = new();
+        private readonly ConcurrentStack<(Variant? switch_expression, bool case_handled)> _switchselect_stack = new();
+
         private volatile int _instruction_pointer = 0;
         private List<(SourceLocation LineLocation, string LineContent)> _line_cache;
 
@@ -289,7 +327,6 @@ public sealed class AU3CallFrame
         public Dictionary<string, int> InternalJumpLabels => _line_cache.WithIndex().Where(l => REGEX_INTERNAL_LABEL.IsMatch(l.Item.LineContent)).ToDictionary(l => l.Item.LineContent, l => l.Index);
 
 
-
         internal AU3CallFrame(AU3Thread thread, CallFrame? caller, AU3Function function, Variant[] args)
             : base(thread, caller, function, args)
         {
@@ -548,19 +585,6 @@ private void InsertReplaceSourceCode(int instruction_ptr, params string[] lines)
             return InterpreterResult.OK;
         }
 
-
-
-
-
-
-        // TODO
-        private readonly ConcurrentDictionary<string, IEnumerator<(Variant key, Variant value)>> _iterators = new();
-        private readonly ConcurrentStack<Variable> _withcontext_stack = new ConcurrentStack<Variable>();
-        private readonly ConcurrentStack<bool> _if_stack = new ConcurrentStack<bool>();
-        private readonly ConcurrentStack<string> _while_stack = new();
-
-        private readonly ConcurrentStack<(Variant? switch_expression, bool case_handled)> _switchselect_stack = new();
-
         private InterpreterError? MoveToEndOf(BlockStatementType type)
         {
             SourceLocation init = CurrentLocation;
@@ -628,41 +652,6 @@ private void InsertReplaceSourceCode(int instruction_ptr, params string[] lines)
             return depth == 0 ? null : WellKnownError("error.no_matching_close", type, init);
         }
 
-
-
-        private const RegexOptions _REGEX_OPTIONS = RegexOptions.IgnoreCase | RegexOptions.Compiled;
-        private static readonly Regex REGEX_INTERNAL_LABEL = new Regex(@"^§\w+$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_VARIABLE = new Regex(@"\$([^\W\d]|[^\W\d]\w*)\b", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_GOTO = new Regex(@"^goto\s+(?<label>.+)$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_WHILE = new Regex(@"^while\s+(?<expression>.+)$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_WEND = new Regex(@"^wend$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_NEXT = new Regex(@"^next$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_EXIT = new Regex(@"^exit(\b\s*(?<code>.+))?$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_RETURN = new Regex(@"^return(\b\s*(?<value>.+))?$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_FOR = new Regex(@"^for\s+.+$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_FORTO = new Regex(@"^for\s+(?<start>.+)\s+to\s+(?<stop>.+?)(\s+step\s+(?<step>.+))?$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_FORIN = new Regex(@"^for\s+(?<variable>.+)\s+in\s+(?<expression>.+)$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_FORIN_VARIABLES = new Regex(@"^\$(?<key>[^\W\d]|[^\W\d]\w*)\s*,\s*\$(?<value>[^\W\d]|[^\W\d]\w*)$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_WITH = new Regex(@"^with\s+(?<variable>.+)$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_ENDWITH = new Regex(@"^endwith$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_REDIM = new Regex(@"^redim\s+(?<expression>.+)$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_DO = new Regex(@"^do$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_UNTIL = new Regex(@"^until\s+(?<expression>.+)$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_IF = new Regex(@"^(?<elif>else)?if\s+(?<condition>.+)\s+then$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_ELSE = new Regex(@"^else$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_ENDIF = new Regex(@"^endif$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_DECLARATION_MODIFIER = new Regex(@"^(local|static|global|const|dim|enum|step)\b", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_ENUM_STEP = new Regex(@"^(?<op>[+\-*]?)(?<step>\d+)\b", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_INCLUDE = new Regex(@"^include?\s+(?<open>[""'<])(?<path>(?:(?!\k<close>).)+)(?<close>[""'>])$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_CONTINUELOOP_EXITLOOP = new Regex(@"^(?<mode>continue|exit)loop\s*(?<level>.+)?\s*$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_SELECT = new Regex(@"^select$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_ENDSELECT = new Regex(@"^endselect$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_SWITCH = new Regex(@"^switch\b\s*(?<expression>.+)$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_ENDSWITCH = new Regex(@"^endswitch$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_CASE = new Regex(@"^case\b\s*(?<expression>.+)*$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_CONTINUECASE = new Regex(@"^continuecase$", _REGEX_OPTIONS);
-
-
         private InterpreterResult? ProcessStatement(string line) => Interpreter.Telemetry.Measure(TelemetryCategory.ProcessStatement, delegate
         {
             InterpreterResult? result = line.Match(null, new Dictionary<Regex, Func<Match, InterpreterResult?>>
diff --git a/new/AutoItInterpreter/Runtime/ScriptScanner.cs b/new/AutoItInterpreter/Runtime/ScriptScanner.cs
index 2033b35c..780758a7 100644
--- a/new/AutoItInterpreter/Runtime/ScriptScanner.cs
+++ b/new/AutoItInterpreter/Runtime/ScriptScanner.cs
@@ -27,7 +27,8 @@ public sealed class ScriptScanner
         private static readonly Regex REGEX_REGION = new Regex(@"^#(end-?)?region\b", _REGEX_OPTIONS);
         private static readonly Regex REGEX_PRAGMA = new Regex(@"^#pragma\s+(?<option>[a-z_]\w+)\b\s*(\((?<params>.*)\))?\s*", _REGEX_OPTIONS);
         private static readonly Regex REGEX_LINECONT = new Regex(@"(\s|^)_$", _REGEX_OPTIONS);
-        private static readonly Regex REGEX_1LFUNC = new Regex(@"^(?<decl>(volatile)?\s*func\b\s*([a-z_]\w*)\s*\(.*\))\s*->\s*(?<body>.+)$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_1L_IF = new Regex(@"^\s*(?<if>if\b\s*.+\s*\bthen)\b\s*(?<then>.+)$", _REGEX_OPTIONS);
+        private static readonly Regex REGEX_1L_FUNC = new Regex(@"^(?<decl>(volatile)?\s*func\b\s*([a-z_]\w*)\s*\(.*\))\s*->\s*(?<body>.+)$", _REGEX_OPTIONS);
         private static readonly Regex REGEX_FUNC = new Regex(@"^(?<volatile>volatile)?\s*func\s+(?<name>[a-z_]\w*)\s*\((?<args>.*)\)$", _REGEX_OPTIONS);
         private static readonly Regex REGEX_ENDFUNC = new Regex(@"^endfunc$", _REGEX_OPTIONS);
         private static readonly Regex REGEX_LABEL = new Regex(@"^(?<name>[a-z_]\w*)\s*:$", _REGEX_OPTIONS);
@@ -196,7 +197,14 @@ private Union<InterpreterError, ScannedScript> ProcessScriptFile(FileInfo file,
                                 loc = new SourceLocation(loc.FileName, loc.StartLineNumber, lines[i].loc.StartLineNumber);
                             }
 
-                        if (line.Match(REGEX_1LFUNC, out m))
+                        if (line.Match(REGEX_1L_IF, out m))
+                            lines.InsertRange(i + 1, new[]
+                            {
+                                (m.Groups["if"].Value, loc),
+                                (m.Groups["then"].Value, loc),
+                                ("endif", loc),
+                            });
+                        else if (line.Match(REGEX_1L_FUNC, out m))
                         {
                             if (Autoit3.CommandLineOptions.StrictMode)
                                 return InterpreterError.WellKnown(loc, "error.experimental.one_liner");
@@ -532,8 +540,8 @@ internal JumpLabel(AU3Function function, SourceLocation location, string name)
     public sealed class AU3Function
         : ScriptFunction
     {
-        private readonly ConcurrentDictionary<string, JumpLabel> _jumplabels = new ConcurrentDictionary<string, JumpLabel>();
-        private readonly ConcurrentDictionary<SourceLocation, string> _lines = new ConcurrentDictionary<SourceLocation, string>();
+        private readonly ConcurrentDictionary<SourceLocation, List<string>> _lines = new();
+        private readonly ConcurrentDictionary<string, JumpLabel> _jumplabels = new();
 
 
         public PARAMETER_DECLARATION[] Parameters { get; }
@@ -550,11 +558,14 @@ public override SourceLocation Location
 
         public bool IsVolatile { get; internal set; }
 
-        public int LineCount => _lines.Count;
+        public int LineCount => _lines.Values.Select(l => l.Count).Append(0).Sum();
 
         public override (int MinimumCount, int MaximumCount) ParameterCount { get; }
 
-        public (SourceLocation LineLocation, string LineContent)[] Lines => _lines.OrderBy(k => k.Key).ToArray(k => (k.Key, k.Value));
+        public (SourceLocation LineLocation, string LineContent)[] Lines => (from loc in _lines.Keys
+                                                                             orderby loc ascending
+                                                                             from line in _lines[loc]
+                                                                             select (loc, line)).ToArray();
 
         public ReadOnlyIndexer<string, JumpLabel?> JumpLabels { get; }
 
@@ -578,9 +589,14 @@ public JumpLabel AddJumpLabel(SourceLocation location, string name)
             return label;
         }
 
-        public void AddLine(SourceLocation location, string content) => _lines.AddOrUpdate(location, content, (_, _) => content);
+        public void AddLine(SourceLocation location, string content) => _lines.AddOrUpdate(location, new List<string>() { content }, (_, l) =>
+        {
+            l.Add(content);
+
+            return l;
+        });
 
-        public override string ToString() => $"{base.ToString()}({string.Join<PARAMETER_DECLARATION>(", ", Parameters)})  [{_lines.Count} Lines]";
+        public override string ToString() => $"{base.ToString()}({string.Join<PARAMETER_DECLARATION>(", ", Parameters)})  [{LineCount} Lines]";
     }
 
     public sealed class NativeFunction
diff --git a/new/AutoItInterpreter/Runtime/StringFormatter.cs b/new/AutoItInterpreter/Runtime/StringFormatter.cs
new file mode 100644
index 00000000..9737caae
--- /dev/null
+++ b/new/AutoItInterpreter/Runtime/StringFormatter.cs
@@ -0,0 +1,103 @@
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using System.Text;
+using System.Linq;
+using System;
+
+using Unknown6656.Common;
+
+namespace Unknown6656.AutoIt3.Runtime
+{
+    // https://www.autoitscript.com/autoit3/docs/functions/StringFormat.htm
+    public static class StringFormatter
+    {
+        private static readonly Regex REGEX_FROMAT = new Regex(@"^%(?<flags>[+\-0#]*)(?<width>\d+)?(\.(?<precision>\d+))?(?<type>[diouxXeEfgGs])", RegexOptions.Compiled);
+        private static readonly Regex REGEX_ESCAPE = new Regex(@"^\\[rnt\\]", RegexOptions.Compiled);
+
+
+        public static string FormatString(string format, IEnumerable<Variant> args) => FormatString(format, args.ToArray());
+
+        public static string FormatString(string format, params Variant[] args)
+        {
+            StringBuilder output = new StringBuilder();
+            int arg_index = 0;
+
+            while (format.Length > 0)
+                if (format.StartsWith("%%"))
+                {
+                    output.Append('%');
+                    format = format[2..];
+                }
+                else if (REGEX_FROMAT.Match(format) is { Success: true, Groups: var g, Length: int len })
+                {
+                    int.TryParse(g["width"].Value, out int width);
+                    int.TryParse(g["precision"].Value, out int precision);
+                    FormatFlags[] flags = g["flag"].Value.Distinct().ToArray(c => (FormatFlags)c);
+                    char type = g["type"].Value[0];
+                    Variant arg = arg_index < args.Length ? args[arg_index] : default;
+
+                    string result = type switch
+                    {
+                        'd' or 'i' => Generics.Do(delegate
+                        {
+                            long value = (long)arg;
+
+                            return (value > 0 && flags.Contains(FormatFlags.Prefix) ? "+" : "") + value.ToString().PadLeft(Math.Max(precision - 1, 0), '0');
+                        }),
+                        'o' => Convert.ToString((uint)(int)arg, 8).PadLeft(precision, '0'),
+                        'u' => ((ulong)(long)arg).ToString().PadLeft(precision, '0'),
+                        'x' or 'X' => ((ulong)(long)arg).ToString($"{type}{precision}"),
+                        'e' or 'E' or 'f' or 'g' or 'G' => arg.ToNumber().ToString($"{type}{precision}"),
+                        _ when precision is 0 => arg.ToString(),
+                        _ => arg.ToString()[..(precision + 1)],
+                    };
+
+                    if (flags.Contains(FormatFlags.ZeroPadding) && width > result.Length)
+                    {
+                        string pad = new string('0', result.Length - width);
+
+                        result = result[0] == '-' ? '-' + pad + result[1..] : pad + result;
+                    }
+
+                    if (flags.Contains(FormatFlags.Blank))
+                        if (type is 'o')
+                            result = "0o" + result;
+                        else if (type is 'x' or 'X')
+                            result = $"0{type}{result}";
+
+                    result = flags.Contains(FormatFlags.LeftAlign) ? result.PadRight(width) : result.PadLeft(width);
+                    format = format[len..];
+                    ++arg_index;
+
+                    output.Append(result);
+                }
+                else if (REGEX_FROMAT.Match(format) is { Success: true, Value: string escape })
+                {
+                    output.Append(escape[1] switch
+                    {
+                        'r' => '\r',
+                        'n' => '\n',
+                        't' => '\t',
+                        '\\' => '\\',
+                        _ => escape[1],
+                    });
+                    format = format[2..];
+                }
+                else
+                {
+                    output.Append(format[0]);
+                    format = format[1..];
+                }
+
+            return output.ToString();
+        }
+
+        private enum FormatFlags
+        {
+            Prefix = '+',
+            LeftAlign = '-',
+            ZeroPadding = '0',
+            Blank = '#',
+        }
+    }
+}
diff --git a/new/AutoItInterpreter/Runtime/Variable.cs b/new/AutoItInterpreter/Runtime/Variable.cs
index 89978d04..32b44e56 100644
--- a/new/AutoItInterpreter/Runtime/Variable.cs
+++ b/new/AutoItInterpreter/Runtime/Variable.cs
@@ -684,25 +684,25 @@ public static bool TryCreateCOM(Interpreter interpreter, string classname, strin
 
         public static explicit operator bool(Variant v) => v.ToBoolean();
 
-        public static explicit operator sbyte(Variant v) => (sbyte)v.ToNumber();
+        public static explicit operator sbyte(Variant v) => Convert.ToSByte(v.ToNumber());
 
-        public static explicit operator byte(Variant v) => (byte)v.ToNumber();
+        public static explicit operator byte(Variant v) => Convert.ToByte(v.ToNumber());
 
-        public static explicit operator short(Variant v) => (short)v.ToNumber();
+        public static explicit operator short(Variant v) => Convert.ToInt16(v.ToNumber());
 
-        public static explicit operator ushort(Variant v) => (ushort)v.ToNumber();
+        public static explicit operator ushort(Variant v) => Convert.ToUInt16(v.ToNumber());
 
-        public static explicit operator int(Variant v) => (int)v.ToNumber();
+        public static explicit operator int(Variant v) => Convert.ToInt32(v.ToNumber());
 
-        public static explicit operator uint(Variant v) => (uint)v.ToNumber();
+        public static explicit operator uint(Variant v) => Convert.ToUInt32(v.ToNumber());
 
-        public static explicit operator long(Variant v) => (long)v.ToNumber();
+        public static explicit operator long(Variant v) => Convert.ToInt64(v.ToNumber());
 
-        public static explicit operator ulong(Variant v) => (ulong)v.ToNumber();
+        public static explicit operator ulong(Variant v) => Convert.ToUInt64(v.ToNumber());
 
-        public static explicit operator float(Variant v) => (float)v.ToNumber();
+        public static explicit operator float(Variant v) => Convert.ToSingle(v.ToNumber());
 
-        public static explicit operator double(Variant v) => (double)v.ToNumber();
+        public static explicit operator double(Variant v) => Convert.ToDouble(v.ToNumber());
 
         public static explicit operator decimal(Variant v) => v.ToNumber();
 
diff --git a/new/AutoItInterpreter/version.txt b/new/AutoItInterpreter/version.txt
index c5cf6596..99a8db1e 100644
--- a/new/AutoItInterpreter/version.txt
+++ b/new/AutoItInterpreter/version.txt
@@ -1,2 +1,2 @@
-0.5.1045.20195
-53153e693226163009d9ef9f010a66e9762ffbde
\ No newline at end of file
+0.5.1055.20195
+b577bfd8fb4d7256e4ed61801285a044356294bb
\ No newline at end of file
diff --git a/new/test/test.au3 b/new/test/test.au3
index b39021cb..2e5e8660 100644
--- a/new/test/test.au3
+++ b/new/test/test.au3
@@ -1,4 +1,51 @@
-ConsoleWrite(StringtrimRight("This is a sentence with whitespace.", 1))
+Example()
+
+Func Example()
+    Local $iInt_Unsigned = 43951789
+    Local $iInt_Negative = -43951789
+
+    ConsoleWrite(@CRLF & "Numeric Formats" & @CRLF)
+
+    PrintFormat($iInt_Unsigned, "%d", "standard positive integer with no sign", 1) ; 43951789
+    PrintFormat($iInt_Negative, "%d", "standard negative integer with sign", 1) ; -43951789
+    PrintFormat($iInt_Unsigned, "%i", "standard integer", 1) ; 43951789
+    PrintFormat($iInt_Unsigned, "%09i", "9 digits with leading zero", 1) ; 043951789
+    PrintFormat($iInt_Unsigned, "%e", "scientific notation") ; 4.395179e+007
+    PrintFormat($iInt_Unsigned, "%u", "unsigned integer with positive integer", 1) ; 43951789
+    PrintFormat($iInt_Negative, "%u", "unsigned integer with negative integer", 1) ; 4251015507
+    PrintFormat($iInt_Unsigned, "%f", "floating point") ; 43951789.000000
+    PrintFormat($iInt_Unsigned, "%.2f", "floating point with 2 digits after decimal point", 1) ; 43951789.00
+    PrintFormat($iInt_Unsigned, "%o", "octal", 1) ; 247523255
+    PrintFormat($iInt_Unsigned, "%s", "string", 1) ; 43951789
+    PrintFormat($iInt_Unsigned, "%x", "hexadecimal (lower-case)", 1) ; 29ea6ad
+    PrintFormat($iInt_Unsigned, "%X", "hexadecimal (upper-case)", 1) ; 29EA6AD
+    PrintFormat($iInt_Unsigned, "%+d", "sign specifier on a positive integer", 1) ; +43951789
+    PrintFormat($iInt_Negative, "%+d", "sign specifier on a negative integer", 1) ; -43951789
+
+    Local $sString = "string"
+    Local $sString_Long = "longstring"
+
+    ConsoleWrite(@CRLF & "String Formats - [ ] used to show beginning/end of string" & @CRLF)
+
+    PrintFormat($sString, "[%s]", "standard string", 1) ; [string]
+    PrintFormat($sString, "[%10s]", "10 chars right justified with added spaces") ; [    string]
+    PrintFormat($sString, "[%-10s]", "10 chars left justified with added spaces") ; [string    ]
+    PrintFormat($sString_Long, "[%10.8s]", "right justified but precision 8 so truncated") ; [  longer s]
+    PrintFormat($sString_Long, "[%-10.8s]", "left justifed but precision 8 so truncated") ; [longer s  ]
+    PrintFormat($sString, "[%010s]", "10 chars with leading zero") ; [0000string]
+
+    ConsoleWrite(@CRLF & "Date Format - each % uses a new parameter" & @CRLF)
+    ConsoleWrite('"%02i\%02i\%04i" 0n (1, 9, 2013) => ' & StringFormat("%02i\%02i\%04i", 1, 9, 2013) & @CRLF)
+
+    ConsoleWrite(@CRLF & "Just string to format  without Vars" & @CRLF)
+    ConsoleWrite('"Some \texample text\n" => ' & StringFormat('Some \texample text\n'))
+EndFunc   ;==>Example
+
+Func PrintFormat($vVar, $sFormat, $sExplan, $iTab = 0)
+    ConsoleWrite('"' & $sFormat & '" on ' & $vVar & @TAB & ' => ' & StringFormat($sFormat, $vVar))
+    If $iTab Then ConsoleWrite(@TAB)
+    ConsoleWrite(@TAB & " ; " & $sExplan & @CRLF)
+EndFunc
 exit
 $xl = ObjCreate("Excel.Application")
 
diff --git a/new/test/unittest-stringformat.au3 b/new/test/unittest-stringformat.au3
new file mode 100644
index 00000000..4178ae47
--- /dev/null
+++ b/new/test/unittest-stringformat.au3
@@ -0,0 +1,81 @@
+#cs
+   SCRIPT FOR UNIT-TESTING THE INTERPRETER
+
+   THE INTERPERETER OUTPUT SHOULD BE:
+	  Numeric Formats
+	  "%d" on 43951789	 => 43951789		 ; standard positive integer with no sign
+	  "%d" on -43951789	 => -43951789		 ; standard negative integer with sign
+	  "%i" on 43951789	 => 43951789		 ; standard integer
+	  "%09i" on 43951789	 => 043951789		 ; 9 digits with leading zero
+	  "%e" on 43951789	 => 4.395179e+007	 ; scientific notation
+	  "%u" on 43951789	 => 43951789		 ; unsigned integer with positive integer
+	  "%u" on -43951789	 => 4251015507		 ; unsigned integer with negative integer
+	  "%f" on 43951789	 => 43951789.000000	 ; floating point
+	  "%.2f" on 43951789	 => 43951789.00		 ; floating point with 2 digits after decimal point
+	  "%o" on 43951789	 => 247523255		 ; octal
+	  "%s" on 43951789	 => 43951789		 ; string
+	  "%x" on 43951789	 => 29ea6ad		 ; hexadecimal (lower-case)
+	  "%X" on 43951789	 => 29EA6AD		 ; hexadecimal (upper-case)
+	  "%+d" on 43951789	 => +43951789		 ; sign specifier on a positive integer
+	  "%+d" on -43951789	 => -43951789		 ; sign specifier on a negative integer
+
+	  String Formats - [ ] used to show beginning/end of string
+	  "[%s]" on string	 => [string]		 ; standard string
+	  "[%10s]" on string	 => [    string]	 ; 10 chars right justified with added spaces
+	  "[%-10s]" on string	 => [string    ]	 ; 10 chars left justified with added spaces
+	  "[%10.8s]" on longstring	 => [  longstri]	 ; right justified but precision 8 so truncated
+	  "[%-10.8s]" on longstring	 => [longstri  ]	 ; left justifed but precision 8 so truncated
+	  "[%010s]" on string	 => [0000string]	 ; 10 chars with leading zero
+
+	  Date Format - each % uses a new parameter
+	  "%02i\%02i\%04i" 0n (1, 9, 2013) => 01\09\2013
+
+	  Just string to format  without Vars
+	  "Some \texample text\n" => Some 	example text
+#ce
+
+Local $iInt_Unsigned = 43951789
+Local $iInt_Negative = -43951789
+
+ConsoleWrite(@CRLF & "Numeric Formats" & @CRLF)
+
+PrintFormat($iInt_Unsigned, "%d", "standard positive integer with no sign", 1) ; 43951789
+PrintFormat($iInt_Negative, "%d", "standard negative integer with sign", 1) ; -43951789
+PrintFormat($iInt_Unsigned, "%i", "standard integer", 1) ; 43951789
+PrintFormat($iInt_Unsigned, "%09i", "9 digits with leading zero", 1) ; 043951789
+PrintFormat($iInt_Unsigned, "%e", "scientific notation") ; 4.395179e+007
+PrintFormat($iInt_Unsigned, "%u", "unsigned integer with positive integer", 1) ; 43951789
+PrintFormat($iInt_Negative, "%u", "unsigned integer with negative integer", 1) ; 4251015507
+PrintFormat($iInt_Unsigned, "%f", "floating point") ; 43951789.000000
+PrintFormat($iInt_Unsigned, "%.2f", "floating point with 2 digits after decimal point", 1) ; 43951789.00
+PrintFormat($iInt_Unsigned, "%o", "octal", 1) ; 247523255
+PrintFormat($iInt_Unsigned, "%s", "string", 1) ; 43951789
+PrintFormat($iInt_Unsigned, "%x", "hexadecimal (lower-case)", 1) ; 29ea6ad
+PrintFormat($iInt_Unsigned, "%X", "hexadecimal (upper-case)", 1) ; 29EA6AD
+PrintFormat($iInt_Unsigned, "%+d", "sign specifier on a positive integer", 1) ; +43951789
+PrintFormat($iInt_Negative, "%+d", "sign specifier on a negative integer", 1) ; -43951789
+
+Local $sString = "string"
+Local $sString_Long = "longstring"
+
+ConsoleWrite(@CRLF & "String Formats - [ ] used to show beginning/end of string" & @CRLF)
+
+PrintFormat($sString, "[%s]", "standard string", 1) ; [string]
+PrintFormat($sString, "[%10s]", "10 chars right justified with added spaces") ; [    string]
+PrintFormat($sString, "[%-10s]", "10 chars left justified with added spaces") ; [string    ]
+PrintFormat($sString_Long, "[%10.8s]", "right justified but precision 8 so truncated") ; [  longer s]
+PrintFormat($sString_Long, "[%-10.8s]", "left justifed but precision 8 so truncated") ; [longer s  ]
+PrintFormat($sString, "[%010s]", "10 chars with leading zero") ; [0000string]
+
+ConsoleWrite(@CRLF & "Date Format - each % uses a new parameter" & @CRLF)
+ConsoleWrite('"%02i\%02i\%04i" 0n (1, 9, 2013) => ' & StringFormat("%02i\%02i\%04i", 1, 9, 2013) & @CRLF)
+
+ConsoleWrite(@CRLF & "Just string to format  without Vars" & @CRLF)
+ConsoleWrite('"Some \texample text\n" => ' & StringFormat('Some \texample text\n'))
+
+
+Func PrintFormat($vVar, $sFormat, $sExplan, $iTab = 0)
+    ConsoleWrite('"' & $sFormat & '" on ' & $vVar & @TAB & ' => ' & StringFormat($sFormat, $vVar))
+    If $iTab Then ConsoleWrite(@TAB)
+    ConsoleWrite(@TAB & " ; " & $sExplan & @CRLF)
+EndFunc
\ No newline at end of file