First rev of the code from svn