Finished dft
Attempt at better subplotting on 1.1.1 and added 1.1.2