Added rudimentary target retrieval