Major changes.  Now full user funcaionality