That is the plan! Also we are in the process of implementing api's for more accurate info