Some initial changes to have a local copy working.