initial commit, baselined mostly to original