Some lexing
Starting to use substeps parsing