Current Version with some Auto-Indent working