[RFC][WIP] redesign steps