Everything included, needs cleanup and uploading figures