initial commit to new fork with our changes