Merged in ezsteps refactor branch