Almost done with round 2 development