Switched to modular parsing.
Layout of modules now clearer and ready for format addition if needed.