WIP more robust target parsing