Basic completed. Starting on reduced equations set
merge conflicts...