added code to automatically detect usernames.., added to TODO lists