initial commit, rough changes.