Started adding custom lexing