Why? Dunno...
Merging
Started implementing OP-timing