Adding version control... not finished