BSY and ISY DRYed up
More export png work