Alpha version of 2.0 complete