Initial working commit using local references.