initial commit of 2.0 (beta)