More work on tapad parser