make this a tracing thing

@basepi, please cherry these