Added back in changes from Friday, still having runtime issues with parser.