Lots of new work on various files.