Refactored main_parser construction!!
Continuing redesign of software layers.