Began to implement new parsing functions.