redid module dependencies, everything is broken.
Fixed some bugs and tests. Still broken.
everthing that was working before is working now. Still three broken tests