0.7.2-Part 1 of Major Reconstruction of the Code