Some new files, some more logging