Cleaned up
Telemetry kind of works