Restarted design.
Arithmetic, timing, OREG done.
Conditional started.
Fixed merge conflicts