Things cleaned up.
The entire library becomes generic based.