Got the S3 generics to export properly :feelsgood: