All but data files working