Added Various functionality
Modified parser stuff