Loading from file now works
merge