started cleaning up files, still lots to clean