WIP: add regular step grad

Change-Id: Iee19761172b38f0e7a5093c0383121fbbc36fe37