Fiddling with dependencies to get things to build.  MIGHT BREAK EVERYTHING...