Linq acting up again

Yet another major overhaul, sigh