replacing dependency engine
more stuff
changes
throwing out some unused code