API Desisgn & Tests..