Interim commit while working on fixing the prompt issues when handling native commands