Nearly have parsing working