Big change to files [WIP]