finished the refactor of the files now i think.