Working on the changeset stuff