all features complete for v2.0