Implement flexible target specification

See commit message.
This seems backwards?