Changed version, rewriting everything for v2.0