fixing api, preparing for dashboards