Implementing via points for API only, no UI. Integrating #147