Converted generic classes from previous project to build a base for beginning.