This branch puts some combinatorial logic in wupper into a clocked process, in order to meet timing easier.