[WIP] Figuring out a way to clean up timing

This doesn't work just yet, but I need to look at the nice color-coded diff to figure out some strange nose failure...