Rando changes
Fixed merge. Simplex is working
Adding files: