More additions, trying to get the filename buffer to work.