Some more cruft. Dependency handling WIP.