Moving away from callback organization.