flesh out most functionality; grafana still not quite working