Initial dump, mostly untested