Update to local copy

Update git fork to my local copy. Much work to be done.