revert previous commit, add id property, add step validation