Match times

To be merged after #919
Tests coming soon.