New version.  Added functionality.  Still basic