I completely agree with Talli, if we want an stronger architecture, will be better to take some time to improve something that maybe from someone perspective is not too good instead of doing semi-implementation of the same thing again. Anyway, it always depends on your time-frame, but if you are betting for the future on your tool, reserve a time for improvement of other related tools, in this case, CR.
