Fixed up code, finds things 'properly' now