More work on data structures, parser skeleton