committing wip - not using kinit any more