Snapshot mode stuff
Dependency fixes, hopefully