Merged the timing and measurement stuff together and cleaned it up a bit