Early revision - some additions needed to get to v0.1