Huge Logic Update

Really, it’s massive, just don’t check the diff.. :/