Significant progress on command parsing