Redesigned Target system so tmpId doesn't need to be passed