Rework parsing strategy approach - starting to clean up.