still working on require and cleaning out some files as well