Feature/linq-ify