F76 action item with John

Hopefully this pull is clear for tracking changes