Generics now required (I can't abide having to maintain two different methods of doing the same damned task!)