Initial dev work complete