Moving expot logic to app section