Building out workflow and extensions to UI