Add callbacks and remove console debugging