File printing working correctly except for time stamps.
merging stuff.