Changes stuff to reflect my mastery of linq