Issue #2 WIP fixed generics.