Initial dev commit for v2.0