More parsing work

THE NIGHTMARE HAS ONLY JUST BEGUN