Also following #98, basically un-doing the downside of de-coupling compute and targets
Also following #98, basically un-doing the downside of de-coupling compute and targets