Add a few TODO's around
API'erize ing