Another line in the sand before big changes.
Refactored generics. Compiles without any errors.