first commit, extracted from mwhite/Vellum