initial commit beta 2