Start on proper exports implementation