Fixed code somewhat
More updates for getting callback code working