Started adding functionality to Users and Tasks