Ok. After a lot of facedesking between me and @consindo, i finally fixed this the way we both wanted it to work