organized file & almost working