Initial import

Factoring this out of Aspen