Generate fluent api

WIP - Generates fluent API in preparation for removing step order