First commit of pre version 2