Added username string functionality
merge changes