Converted project to use diego's callback system from his RoA