Initial impound of files
More updates before taking a break