Started work on new API that uses both proto and http API.

x