Added fold-computation and first integration of design