Need a bit more work before we include version and commit