Still issues with exports