Everything is read in from files now
merge