Working on version control