Added files from before summer