Not ready, but getting closer.  Need to add some more functionality to other classes.