@simonlamprell This satisfies that requirement. How does this PR look?