added filename-existance check. Not working yet.