reorganizing stuff and working on random stuff