Changes made 9.25.2013. About 30% through converting to generics.
Changes made 9.25.2013. About halfway though converting to generics.