The logic here was already very all-over-the place and I fear it has become more so with the added complexity :(