Remove archive
Make bunch of changes to graphing