made some progress.  committing to change Class to something better.

Signed-off-by: Travis Waalkens <Travis.Waalkens@gmail.com>