WIP: FTE Tutorial refactor