Reorder methods
Add accessors to step form