Initial commit
Step logic more zero-based