Some more structural changes
parsed prefixes, contemplating state tracker