Added some more stages to the calculation definition process, including number conservation and two site expectation value refinement, i.e. now you can shoose what kind of two-site observables to calculate for each