Started work on API
Wtf? Merge?