Add initial scanning and parsing code